Title: [139076] trunk/Source/WebKit2
- Revision
- 139076
- Author
- [email protected]
- Date
- 2013-01-08 10:34:38 -0800 (Tue, 08 Jan 2013)
Log 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().
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139075 => 139076)
--- trunk/Source/WebKit2/ChangeLog 2013-01-08 18:17:04 UTC (rev 139075)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-08 18:34:38 UTC (rev 139076)
@@ -1,3 +1,29 @@
+2013-01-08 Sam Weinig <[email protected]>
+
+ 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 <[email protected]>
[WK2] NetworkProcess should have a Keychain shim
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (139075 => 139076)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2013-01-08 18:17:04 UTC (rev 139075)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2013-01-08 18:34:38 UTC (rev 139076)
@@ -95,9 +95,6 @@
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;
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (139075 => 139076)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-01-08 18:17:04 UTC (rev 139075)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2013-01-08 18:34:38 UTC (rev 139076)
@@ -291,12 +291,12 @@
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)
Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp (139075 => 139076)
--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp 2013-01-08 18:17:04 UTC (rev 139075)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp 2013-01-08 18:34:38 UTC (rev 139076)
@@ -129,7 +129,7 @@
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 @@
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
Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h (139075 => 139076)
--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2013-01-08 18:17:04 UTC (rev 139075)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2013-01-08 18:34:38 UTC (rev 139076)
@@ -65,9 +65,6 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
