Title: [178604] trunk/Source/WebKit2
- Revision
- 178604
- Author
- [email protected]
- Date
- 2015-01-16 14:22:46 -0800 (Fri, 16 Jan 2015)
Log Message
More WebPageProxy CTTE
https://bugs.webkit.org/show_bug.cgi?id=140565
Reviewed by Andreas Kling.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::connectionWillOpen):
(WebKit::WebPageProxy::connectionDidClose):
(WebKit::WebPageProxy::connectionWillClose): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::connectionWillOpen):
(WebKit::WebProcessProxy::connectionDidClose):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (178603 => 178604)
--- trunk/Source/WebKit2/ChangeLog 2015-01-16 22:13:08 UTC (rev 178603)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 22:22:46 UTC (rev 178604)
@@ -1,5 +1,21 @@
2015-01-16 Anders Carlsson <[email protected]>
+ More WebPageProxy CTTE
+ https://bugs.webkit.org/show_bug.cgi?id=140565
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::connectionWillOpen):
+ (WebKit::WebPageProxy::connectionDidClose):
+ (WebKit::WebPageProxy::connectionWillClose): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::connectionWillOpen):
+ (WebKit::WebProcessProxy::connectionDidClose):
+
+2015-01-16 Anders Carlsson <[email protected]>
+
Remove dead code
https://bugs.webkit.org/show_bug.cgi?id=140563
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178603 => 178604)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 22:13:08 UTC (rev 178603)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 22:22:46 UTC (rev 178604)
@@ -3220,17 +3220,17 @@
m_uiClient->didCancelTrackingPotentialLongMousePress(this, m_process->transformHandlesToObjects(userData.object()).get());
}
-void WebPageProxy::connectionWillOpen(IPC::Connection* connection)
+void WebPageProxy::connectionWillOpen(IPC::Connection& connection)
{
- ASSERT(connection == m_process->connection());
+ ASSERT(&connection == m_process->connection());
m_webProcessLifetimeTracker.connectionWillOpen();
- m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, connection);
+ m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, &connection);
}
-void WebPageProxy::connectionWillClose(IPC::Connection* connection)
+void WebPageProxy::connectionDidClose(IPC::Connection& connection)
{
- ASSERT_UNUSED(connection, connection == m_process->connection());
+ ASSERT_UNUSED(connection, &connection == m_process->connection());
m_webProcessLifetimeTracker.connectionWillClose();
m_process->processPool().storageManager().setAllowedSessionStorageNamespaceConnection(m_pageID, 0);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (178603 => 178604)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-16 22:13:08 UTC (rev 178603)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-16 22:22:46 UTC (rev 178604)
@@ -911,8 +911,8 @@
void didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>&);
void didCancelCheckingText(uint64_t requestID);
- void connectionWillOpen(IPC::Connection*);
- void connectionWillClose(IPC::Connection*);
+ void connectionWillOpen(IPC::Connection&);
+ void connectionDidClose(IPC::Connection&);
void processDidFinishLaunching();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (178603 => 178604)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-16 22:13:08 UTC (rev 178603)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-01-16 22:22:46 UTC (rev 178604)
@@ -131,16 +131,16 @@
SecItemShimProxy::shared().initializeConnection(connection);
#endif
- for (WebPageProxyMap::iterator it = m_pageMap.begin(), end = m_pageMap.end(); it != end; ++it)
- it->value->connectionWillOpen(&connection);
+ for (auto& page : m_pageMap.values())
+ page->connectionWillOpen(connection);
}
void WebProcessProxy::connectionDidClose(IPC::Connection& connection)
{
ASSERT(this->connection() == &connection);
- for (WebPageProxyMap::iterator it = m_pageMap.begin(), end = m_pageMap.end(); it != end; ++it)
- it->value->connectionWillClose(&connection);
+ for (auto& page : m_pageMap.values())
+ page->connectionDidClose(connection);
}
void WebProcessProxy::disconnect()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
