summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2012-08-31 11:56:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-31 11:56:21 -0700
commit9fa7e7c0d2dbd5ad706d1c46cb839ba07a45a7a8 (patch)
tree7d0cb95f04dfa2bc0e3b653618aad4d6f8109f8d
parent9c867b2b4e0e91da41dd0e5efd93dd6078bc63f8 (diff)
parent7151ed0c74599db4d9b1871416814b9a05214ba6 (diff)
downloadexternal_webkit-9fa7e7c0d2dbd5ad706d1c46cb839ba07a45a7a8.zip
external_webkit-9fa7e7c0d2dbd5ad706d1c46cb839ba07a45a7a8.tar.gz
external_webkit-9fa7e7c0d2dbd5ad706d1c46cb839ba07a45a7a8.tar.bz2
Merge "Fix potential corruption/leak in cookiejar." into jb-mr1-dev
-rw-r--r--Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
index 0af3cc2..f42f307 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
@@ -189,7 +189,7 @@ int WebCookieJar::getNumCookiesInDatabase()
return cookieStore()->GetCookieMonster()->GetAllCookies().size();
}
-class FlushSemaphore : public base::RefCounted<FlushSemaphore>
+class FlushSemaphore : public base::RefCountedThreadSafe<FlushSemaphore>
{
public:
FlushSemaphore()