Changeset 136148 in webkit

Timestamp:

Nov 29, 2012, 12:15:27 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Cookies in private mode should not have access to public cookies
​https://bugs.webkit.org/show_bug.cgi?id=103649

Patch by Otto Derek Cheung <​otcheung@rim.com> on 2012-11-29
Reviewed by Rob Buis.

PR 253983

When CookieManager switches back from public to private mode,
we will clear the cookie tree so the browser won't have access
to the public cookies.

Tested using browser.swlab.rim.net cookie tests and the steps in
the PR.

• platform/blackberry/CookieManager.cpp:

(WebCore::CookieManager::setPrivateMode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/blackberry/CookieManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] Cookies in private mode should not have access to public cookies
+        https://bugs.webkit.org/show_bug.cgi?id=103649
+
+        Reviewed by Rob Buis.
+
+        PR 253983
+
+        When CookieManager switches back from public to private mode,
+        we will clear the cookie tree so the browser won't have access
+        to the public cookies.
+
+        Tested using browser.swlab.rim.net cookie tests and the steps in
+        the PR.
+
+        * platform/blackberry/CookieManager.cpp:
+        (WebCore::CookieManager::setPrivateMode):
+
 2012-11-29  Brent Fulgham  <bfulgham@gmail.com>
 

trunk/Source/WebCore/platform/blackberry/CookieManager.cpp

@@ -503 +503 @@
 }
 
-void CookieManager::setPrivateMode(bool mode)
-{
-    if (m_privateMode == mode)
+void CookieManager::setPrivateMode(bool privateMode)
+{
+    if (m_privateMode == privateMode)
         return;
 
-    m_privateMode = mode;
-    if (!mode) {
-        removeAllCookies(DoNotRemoveFromBackingStore);
+    m_privateMode = privateMode;
+
+    removeAllCookies(DoNotRemoveFromBackingStore);
+
+    // If we are switching back to public mode, reload the database to memory.
+    if (!m_privateMode)
         getBackingStoreCookies();
-    }
 }