Changeset 139076 in webkit

Timestamp:

Jan 8, 2013 10:34:38 AM (11 years ago)

Author:

weinig@apple.com

Message:

Remove dead Connection members in ChildProcess subclasses (and their users)
​https://bugs.webkit.org/show_bug.cgi?id=106347
<rdar://problem/12973955>

Reviewed by Alexey Proskuryakov.

This also fixes a crash when entering fullscreen with a plug-in.

• PluginProcess/PluginProcess.h:

Remove dead m_connection member.

• PluginProcess/mac/PluginProcessMac.mm:

(WebKit::PluginProcess::setModalWindowIsShowing):
(WebKit::PluginProcess::setFullscreenWindowIsShowing):
Replace use of m_connection, which is dead, with parentProcessConnection().

• SharedWorkerProcess/SharedWorkerProcess.h:

(SharedWorkerProcess):
Remove dead m_connection member.

• SharedWorkerProcess/SharedWorkerProcess.cpp:

(WebKit::SharedWorkerProcess::createWebProcessConnection):
Replace use of m_connection, which is dead, with parentProcessConnection().

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginProcess.h (modified) (1 diff)
• PluginProcess/mac/PluginProcessMac.mm (modified) (1 diff)
• SharedWorkerProcess/SharedWorkerProcess.cpp (modified) (2 diffs)
• SharedWorkerProcess/SharedWorkerProcess.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-08  Sam Weinig  <sam@webkit.org>
+
+        Remove dead Connection members in ChildProcess subclasses (and their users)
+        https://bugs.webkit.org/show_bug.cgi?id=106347
+        <rdar://problem/12973955>
+
+        Reviewed by Alexey Proskuryakov.
+
+        This also fixes a crash when entering fullscreen with a plug-in.
+
+        * PluginProcess/PluginProcess.h:
+        Remove dead m_connection member.
+
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::PluginProcess::setModalWindowIsShowing):
+        (WebKit::PluginProcess::setFullscreenWindowIsShowing):
+        Replace use of m_connection, which is dead, with parentProcessConnection().
+
+        * SharedWorkerProcess/SharedWorkerProcess.h:
+        (SharedWorkerProcess):
+        Remove dead m_connection member.
+
+        * SharedWorkerProcess/SharedWorkerProcess.cpp:
+        (WebKit::SharedWorkerProcess::createWebProcessConnection):
+        Replace use of m_connection, which is dead, with parentProcessConnection().
+
 2013-01-07  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -96 +96 @@
     void minimumLifetimeTimerFired();
 
-    // The connection to the UI process.
-    RefPtr<CoreIPC::Connection> m_connection;
-
     // Our web process connections.
     Vector<RefPtr<WebProcessConnection> > m_webProcessConnections;

trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm

@@ -292 +292 @@
 void PluginProcess::setModalWindowIsShowing(bool modalWindowIsShowing)
 {
-    m_connection->send(Messages::PluginProcessProxy::SetModalWindowIsShowing(modalWindowIsShowing), 0);
+    parentProcessConnection()->send(Messages::PluginProcessProxy::SetModalWindowIsShowing(modalWindowIsShowing), 0);
 }
 
 void PluginProcess::setFullscreenWindowIsShowing(bool fullscreenWindowIsShowing)
 {
-    m_connection->send(Messages::PluginProcessProxy::SetFullscreenWindowIsShowing(fullscreenWindowIsShowing), 0);
+    parentProcessConnection()->send(Messages::PluginProcessProxy::SetFullscreenWindowIsShowing(fullscreenWindowIsShowing), 0);
 }
 

trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp

@@ -130 +130 @@
 
     CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
-    m_connection->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientPort), 0);
+    parentProcessConnection()->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientPort), 0);
 #elif USE(UNIX_DOMAIN_SOCKETS)
     int sockets[2];
@@ -162 +162 @@
 
     CoreIPC::Attachment clientSocket(sockets[0]);
-    m_connection->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientSocket), 0);
+    parentProcessConnection()->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientSocket), 0);
 #else
     notImplemented();

trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h

@@ -66 +66 @@
     void minimumLifetimeTimerFired();
 
-    // The connection to the UI process.
-    RefPtr<CoreIPC::Connection> m_connection;
-
     // Our web process connections.
     Vector<RefPtr<WebProcessConnection> > m_webProcessConnections;