Title: [158087] trunk/Source/WebKit2
- Revision
- 158087
- Author
- commit-qu...@webkit.org
- Date
- 2013-10-26 10:09:31 -0700 (Sat, 26 Oct 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158086 => 158087)
--- trunk/Source/WebKit2/ChangeLog 2013-10-26 16:11:17 UTC (rev 158086)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-26 17:09:31 UTC (rev 158087)
@@ -1,3 +1,19 @@
+2013-10-26 Commit Queue <commit-qu...@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.p...@company100.net>
Remove Coordinated Graphics bits from DrawingAreaProxyImpl
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (158086 => 158087)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-10-26 16:11:17 UTC (rev 158086)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-10-26 17:09:31 UTC (rev 158087)
@@ -428,34 +428,26 @@
void WebContext::willStartUsingPrivateBrowsing()
{
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());
+ }
}
void WebContext::willStopUsingPrivateBrowsing()
{
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);
-
+ for (size_t i = 0, count = contexts.size(); i < count; ++i) {
#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 (contexts[i]->usesNetworkProcess() && contexts[i]->networkProcess())
+ contexts[i]->networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(), 0);
+#endif
- if (privateBrowsingEnabled)
- sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession());
- else
- sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession());
+ contexts[i]->sendToAllProcesses(Messages::WebProcess::DestroyPrivateBrowsingSession());
+ }
}
void (*s_invalidMessageCallback)(WKStringRef messageName);
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (158086 => 158087)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-10-26 16:11:17 UTC (rev 158086)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-10-26 17:09:31 UTC (rev 158087)
@@ -398,8 +398,6 @@
void addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash);
void plugInDidReceiveUserInteraction(unsigned plugInOriginHash);
- void setPrivateBrowsingEnabled(bool);
-
#if ENABLE(NETSCAPE_PLUGIN_API)
// PluginInfoStoreClient:
virtual void pluginInfoStoreDidLoadPlugins(PluginInfoStore*) OVERRIDE;
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (158086 => 158087)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2013-10-26 16:11:17 UTC (rev 158086)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2013-10-26 17:09:31 UTC (rev 158087)
@@ -293,9 +293,4 @@
didChangeIconForPageURL(pageURL);
}
-void WebIconDatabase::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
-{
- m_iconDatabaseImpl->setPrivateBrowsingEnabled(privateBrowsingEnabled);
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.h (158086 => 158087)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2013-10-26 16:11:17 UTC (rev 158086)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.h 2013-10-26 17:09:31 UTC (rev 158087)
@@ -87,8 +87,6 @@
void initializeIconDatabaseClient(const WKIconDatabaseClient*);
- void setPrivateBrowsingEnabled(bool);
-
private:
WebIconDatabase(WebContext*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
