Title: [178608] trunk/Source/WebKit2
- Revision
- 178608
- Author
- [email protected]
- Date
- 2015-01-16 15:41:39 -0800 (Fri, 16 Jan 2015)
Log Message
Pass the connection along to WebProcessLifetimeTracker
https://bugs.webkit.org/show_bug.cgi?id=140569
Reviewed by Andreas Kling.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::connectionWillOpen):
(WebKit::WebPageProxy::connectionDidClose):
* UIProcess/WebProcessLifetimeTracker.cpp:
(WebKit::WebProcessLifetimeTracker::connectionWillOpen):
(WebKit::WebProcessLifetimeTracker::connectionDidClose):
(WebKit::WebProcessLifetimeTracker::connectionWillClose): Deleted.
* UIProcess/WebProcessLifetimeTracker.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (178607 => 178608)
--- trunk/Source/WebKit2/ChangeLog 2015-01-16 23:32:33 UTC (rev 178607)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 23:41:39 UTC (rev 178608)
@@ -1,5 +1,21 @@
2015-01-16 Anders Carlsson <[email protected]>
+ Pass the connection along to WebProcessLifetimeTracker
+ https://bugs.webkit.org/show_bug.cgi?id=140569
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::connectionWillOpen):
+ (WebKit::WebPageProxy::connectionDidClose):
+ * UIProcess/WebProcessLifetimeTracker.cpp:
+ (WebKit::WebProcessLifetimeTracker::connectionWillOpen):
+ (WebKit::WebProcessLifetimeTracker::connectionDidClose):
+ (WebKit::WebProcessLifetimeTracker::connectionWillClose): Deleted.
+ * UIProcess/WebProcessLifetimeTracker.h:
+
+2015-01-16 Anders Carlsson <[email protected]>
+
More WebPageProxy CTTE
https://bugs.webkit.org/show_bug.cgi?id=140565
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178607 => 178608)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 23:32:33 UTC (rev 178607)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 23:41:39 UTC (rev 178608)
@@ -3224,16 +3224,14 @@
{
ASSERT(&connection == m_process->connection());
- m_webProcessLifetimeTracker.connectionWillOpen();
- m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, &connection);
+ m_webProcessLifetimeTracker.connectionWillOpen(connection);
}
void WebPageProxy::connectionDidClose(IPC::Connection& connection)
{
ASSERT_UNUSED(connection, &connection == m_process->connection());
- m_webProcessLifetimeTracker.connectionWillClose();
- m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
+ m_webProcessLifetimeTracker.connectionDidClose(connection);
}
void WebPageProxy::processDidFinishLaunching()
Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp (178607 => 178608)
--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-01-16 23:32:33 UTC (rev 178607)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-01-16 23:41:39 UTC (rev 178608)
@@ -52,7 +52,7 @@
observer.addWebPage(m_webPageProxy);
}
-void WebProcessLifetimeTracker::connectionWillOpen()
+void WebProcessLifetimeTracker::connectionWillOpen(IPC::Connection&)
{
ASSERT(processIsRunning());
@@ -60,7 +60,7 @@
observer->addWebPage(m_webPageProxy);
}
-void WebProcessLifetimeTracker::connectionWillClose()
+void WebProcessLifetimeTracker::connectionDidClose(IPC::Connection&)
{
ASSERT(processIsRunning());
Modified: trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h (178607 => 178608)
--- trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-01-16 23:32:33 UTC (rev 178607)
+++ trunk/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-01-16 23:41:39 UTC (rev 178608)
@@ -28,6 +28,10 @@
#include <wtf/HashSet.h>
+namespace IPC {
+class Connection;
+}
+
namespace WebKit {
class WebPageProxy;
@@ -40,8 +44,8 @@
void addObserver(WebProcessLifetimeObserver&);
- void connectionWillOpen();
- void connectionWillClose();
+ void connectionWillOpen(IPC::Connection&);
+ void connectionDidClose(IPC::Connection&);
void pageWasInvalidated();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
