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().

Canonical link: https://commits.webkit.org/124532@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139076 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,29 @@
+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>
 
         [WK2] NetworkProcess should have a Keychain shim

Source/WebKit2/PluginProcess/PluginProcess.h

@@ -95,9 +95,6 @@ class PluginProcess : public ChildProcess {
     void setMinimumLifetime(double);
     void minimumLifetimeTimerFired();
 
-    // The connection to the UI process.
-    RefPtr<CoreIPC::Connection> m_connection;
-
     // Our web process connections.
     Vector<RefPtr<WebProcessConnection> > m_webProcessConnections;
 

Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm

@@ -291,12 +291,12 @@ static void initializeCocoaOverrides()
 
 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);
 }
 
 static void initializeSandbox(const String& pluginPath, const String& sandboxProfileDirectoryPath)

Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp

@@ -129,7 +129,7 @@ void SharedWorkerProcess::createWebProcessConnection()
     m_webProcessConnections.append(connection.release());
 
     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];
     if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) == -1) {
@@ -161,7 +161,7 @@ void SharedWorkerProcess::createWebProcessConnection()
     m_webProcessConnections.append(connection.release());
 
     CoreIPC::Attachment clientSocket(sockets[0]);
-    m_connection->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientSocket), 0);
+    parentProcessConnection()->send(Messages::SharedWorkerProcessProxy::DidCreateWebProcessConnection(clientSocket), 0);
 #else
     notImplemented();
 #endif

Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h

@@ -65,9 +65,6 @@ class SharedWorkerProcess : public ChildProcess {
     void setMinimumLifetime(double);
     void minimumLifetimeTimerFired();
 
-    // The connection to the UI process.
-    RefPtr<CoreIPC::Connection> m_connection;
-
     // Our web process connections.
     Vector<RefPtr<WebProcessConnection> > m_webProcessConnections;