[webkit-changes] [205156] trunk/Source/WebKit2

[andersca]

Title: [205156] trunk/Source/WebKit2

Revision

205156

Author

ander...@apple.com

Date

2016-08-29 16:10:56 -0700 (Mon, 29 Aug 2016)

Log Message

Remove the last uses of WebProcessProxy::fromConnection
https://bugs.webkit.org/show_bug.cgi?id=161355

Reviewed by Tim Horton.

* UIProcess/WebProcessPool.cpp:
(WebKit::webProcessProxyFromConnection):
(WebKit::WebProcessPool::handleMessage):
(WebKit::WebProcessPool::handleSynchronousMessage):
(WebKit::WebProcessPool::startedUsingGamepads):
(WebKit::WebProcessPool::stoppedUsingGamepads):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (205155 => 205156)

--- trunk/Source/WebKit2/ChangeLog	2016-08-29 23:07:20 UTC (rev 205155)
+++ trunk/Source/WebKit2/ChangeLog	2016-08-29 23:10:56 UTC (rev 205156)
@@ -1,5 +1,19 @@
 2016-08-29  Anders Carlsson  <ander...@apple.com>
 
+        Remove the last uses of WebProcessProxy::fromConnection
+        https://bugs.webkit.org/show_bug.cgi?id=161355
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::webProcessProxyFromConnection):
+        (WebKit::WebProcessPool::handleMessage):
+        (WebKit::WebProcessPool::handleSynchronousMessage):
+        (WebKit::WebProcessPool::startedUsingGamepads):
+        (WebKit::WebProcessPool::stoppedUsingGamepads):
+
+2016-08-29  Anders Carlsson  <ander...@apple.com>
+
         Get rid of another use of WebProcessProxy::fromConnection
         https://bugs.webkit.org/show_bug.cgi?id=161331
 

Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (205155 => 205156)

--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-08-29 23:07:20 UTC (rev 205155)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp	2016-08-29 23:10:56 UTC (rev 205156)
@@ -1216,9 +1216,20 @@
     m_networkProcess->send(Messages::NetworkProcess::GetNetworkProcessStatistics(requestID), 0);
 }
 
+static WebProcessProxy* webProcessProxyFromConnection(IPC::Connection& connection, const Vector<RefPtr<WebProcessProxy>>& processes)
+{
+    for (auto& process : processes) {
+        if (process->connection() == &connection)
+            return process.get();
+    }
+
+    // FIXME: Can this ever return null?
+    return nullptr;
+}
+
 void WebProcessPool::handleMessage(IPC::Connection& connection, const String& messageName, const WebKit::UserData& messageBody)
 {
-    auto* webProcessProxy = WebProcessProxy::fromConnection(&connection);
+    auto* webProcessProxy = webProcessProxyFromConnection(connection, m_processes);
     if (!webProcessProxy)
         return;
     m_injectedBundleClient.didReceiveMessageFromInjectedBundle(this, messageName, webProcessProxy->transformHandlesToObjects(messageBody.object()).get());
@@ -1226,7 +1237,7 @@
 
 void WebProcessPool::handleSynchronousMessage(IPC::Connection& connection, const String& messageName, const UserData& messageBody, UserData& returnUserData)
 {
-    auto* webProcessProxy = WebProcessProxy::fromConnection(&connection);
+    auto* webProcessProxy = webProcessProxyFromConnection(connection, m_processes);
     if (!webProcessProxy)
         return;
 
@@ -1250,7 +1261,7 @@
 
 void WebProcessPool::startedUsingGamepads(IPC::Connection& connection)
 {
-    auto* proxy = WebProcessProxy::fromConnection(&connection);
+    auto* proxy = webProcessProxyFromConnection(connection, m_processes);
     if (!proxy)
         return;
 
@@ -1265,7 +1276,7 @@
 
 void WebProcessPool::stoppedUsingGamepads(IPC::Connection& connection)
 {
-    auto* proxy = WebProcessProxy::fromConnection(&connection);
+    auto* proxy = webProcessProxyFromConnection(connection, m_processes);
     if (!proxy)
         return;
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes