Changeset 158087 in webkit

Timestamp:

Oct 26, 2013 10:09:31 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r158075.
​http://trac.webkit.org/changeset/158075
​https://bugs.webkit.org/show_bug.cgi?id=123389

Broke WebKit2.PrivateBrowsingPushStateNoHistoryCallback API
test (Requested by ap on #webkit).

• UIProcess/WebContext.cpp:

(WebKit::WebContext::willStartUsingPrivateBrowsing):
(WebKit::WebContext::willStopUsingPrivateBrowsing):

• UIProcess/WebContext.h:
• UIProcess/WebIconDatabase.cpp:
• 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-26  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r158075.
+        http://trac.webkit.org/changeset/158075
+        https://bugs.webkit.org/show_bug.cgi?id=123389
+
+        Broke WebKit2.PrivateBrowsingPushStateNoHistoryCallback API
+        test (Requested by ap on #webkit).
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::willStartUsingPrivateBrowsing):
+        (WebKit::WebContext::willStopUsingPrivateBrowsing):
+        * UIProcess/WebContext.h:
+        * UIProcess/WebIconDatabase.cpp:
+        * UIProcess/WebIconDatabase.h:
+
 2013-10-26  Jae Hyun Park  <jae.park@company100.net>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -429 +429 @@
 {
     const Vector<WebContext*>& contexts = allContexts();
-    for (size_t i = 0, count = contexts.size(); i < count; ++i)
-        contexts[i]->setPrivateBrowsingEnabled(true);
+    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());
+    }
 }
 
@@ -436 +441 @@
 {
     const Vector<WebContext*>& contexts = allContexts();
-    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());
+    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());
+    }
 }
 

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*);