Changeset 158075 in webkit

Timestamp:

Oct 25, 2013 5:29:17 PM (11 years ago)

Author:

beidson@apple.com

Message:

WebIconDatabase can miss private browsing state changes.
<rdar://problem/15322318> and ​https://bugs.webkit.org/show_bug.cgi?id=123375

Reviewed by Beth Dakin.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::willStartUsingPrivateBrowsing): Call setPrivateBrowsingEnabled(true) on each context.
(WebKit::WebContext::willStopUsingPrivateBrowsing): Call setPrivateBrowsingEnabled(false) on each context.
(WebKit::WebContext::setPrivateBrowsingEnabled): In addition to notifying other processes, notify WebIconDatabase.

• UIProcess/WebContext.h:

• UIProcess/WebIconDatabase.cpp:

(WebKit::WebIconDatabase::setPrivateBrowsingEnabled):

• UIProcess/WebIconDatabase.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (2 diffs)
• UIProcess/WebContext.h (modified) (1 diff)
• UIProcess/WebIconDatabase.cpp (modified) (1 diff)
• UIProcess/WebIconDatabase.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-10-25  Brady Eidson  <beidson@apple.com>
+
+        WebIconDatabase can miss private browsing state changes.
+        <rdar://problem/15322318> and https://bugs.webkit.org/show_bug.cgi?id=123375
+
+        Reviewed by Beth Dakin.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::willStartUsingPrivateBrowsing): Call setPrivateBrowsingEnabled(true) on each context.
+        (WebKit::WebContext::willStopUsingPrivateBrowsing): Call setPrivateBrowsingEnabled(false) on each context.
+        (WebKit::WebContext::setPrivateBrowsingEnabled): In addition to notifying other processes, notify WebIconDatabase.
+        * UIProcess/WebContext.h:
+
+        * UIProcess/WebIconDatabase.cpp:
+        (WebKit::WebIconDatabase::setPrivateBrowsingEnabled):
+        * UIProcess/WebIconDatabase.h:
+
 2013-10-25  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -429 +429 @@
 {
     const Vector<WebContext*>& contexts = allContexts();
-    for (size_t i = 0, count = contexts.size(); i < count; ++i) {
-#if ENABLE(NETWORK_PROCESS)
-        if (contexts[i]->usesNetworkProcess() && contexts[i]->networkProcess())
-            contexts[i]->networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(), 0);
-#endif
-        contexts[i]->sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession());
-    }
+    for (size_t i = 0, count = contexts.size(); i < count; ++i)
+        contexts[i]->setPrivateBrowsingEnabled(true);
 }
 
@@ -441 +436 @@
 {
     const Vector<WebContext*>& contexts = allContexts();
-    for (size_t i = 0, count = contexts.size(); i < count; ++i) {
-#if ENABLE(NETWORK_PROCESS)
-        if (contexts[i]->usesNetworkProcess() && contexts[i]->networkProcess())
-            contexts[i]->networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(), 0);
-#endif
-
-        contexts[i]->sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession());
-    }
+    for (size_t i = 0, count = contexts.size(); i < count; ++i)
+        contexts[i]->setPrivateBrowsingEnabled(false);
+}
+
+void WebContext::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
+{
+    m_iconDatabase->setPrivateBrowsingEnabled(privateBrowsingEnabled);
+
+#if ENABLE(NETWORK_PROCESS)
+    if (usesNetworkProcess() && networkProcess()) {
+        if (privateBrowsingEnabled)
+            networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(), 0);
+        else
+            networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(), 0);
+    }
+#endif // ENABLED(NETWORK_PROCESS)
+
+    if (privateBrowsingEnabled)
+        sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession());
+    else
+        sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession());
 }
 

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -399 +399 @@
     void plugInDidReceiveUserInteraction(unsigned plugInOriginHash);
 
+    void setPrivateBrowsingEnabled(bool);
+
 #if ENABLE(NETSCAPE_PLUGIN_API)
     // PluginInfoStoreClient:

trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

@@ -294 +294 @@
 }
 
+void WebIconDatabase::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
+{
+    m_iconDatabaseImpl->setPrivateBrowsingEnabled(privateBrowsingEnabled);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/WebIconDatabase.h

@@ -88 +88 @@
     void initializeIconDatabaseClient(const WKIconDatabaseClient*);
 
+    void setPrivateBrowsingEnabled(bool);
+    
 private:
     WebIconDatabase(WebContext*);