summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-12-22 12:09:14 +0000
committerKristian Monsen <kristianm@google.com>2010-12-22 12:20:53 +0000
commitc5be2c45ac53063054dddaffbacada021cd6491f (patch)
tree24fed7181d54453635b2ac1a6088d9f9379dd5d5
parentb954c48e40c25750515eab62a316b8202a1bcbcc (diff)
downloadexternal_webkit-c5be2c45ac53063054dddaffbacada021cd6491f.zip
external_webkit-c5be2c45ac53063054dddaffbacada021cd6491f.tar.gz
external_webkit-c5be2c45ac53063054dddaffbacada021cd6491f.tar.bz2
Removing the host resolver leak
The crash was fixed when some unsafe local changes were removed recently. I think this was what removed the crash: https://android-git.corp.google.com/g/#change,84795 Fix for bug 3243797 Change-Id: If23e55270f035831ef7781681b012dfdca0ac74d
-rw-r--r--WebKit/android/WebCoreSupport/WebCache.cpp7
-rw-r--r--WebKit/android/WebCoreSupport/WebCache.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/android/WebCoreSupport/WebCache.cpp b/WebKit/android/WebCoreSupport/WebCache.cpp
index c7a6a1d..778d492 100644
--- a/WebKit/android/WebCoreSupport/WebCache.cpp
+++ b/WebKit/android/WebCoreSupport/WebCache.cpp
@@ -87,13 +87,6 @@ void WebCache::cleanup(bool isPrivateBrowsing)
*instancePtr = 0;
}
-WebCache::~WebCache()
-{
- // We currently leak the HostResolver object to avoid a crash.
- // TODO: Fix this. See b/3243797
- m_hostResolver.leakPtr();
-}
-
WebCache::WebCache(bool isPrivateBrowsing)
: m_doomAllEntriesCallback(this, &WebCache::doomAllEntries)
, m_doneCallback(this, &WebCache::onClearDone)
diff --git a/WebKit/android/WebCoreSupport/WebCache.h b/WebKit/android/WebCoreSupport/WebCache.h
index 50ad03c..be6c968 100644
--- a/WebKit/android/WebCoreSupport/WebCache.h
+++ b/WebKit/android/WebCoreSupport/WebCache.h
@@ -39,7 +39,6 @@ class WebCache : public base::RefCountedThreadSafe<WebCache> {
public:
static WebCache* get(bool isPrivateBrowsing);
- ~WebCache();
void clear();
static void cleanup(bool isPrivateBrowsing);
net::HostResolver* hostResolver() { return m_hostResolver.get(); }