Title: [168595] trunk/Source/WebKit2
- Revision
- 168595
- Author
- [email protected]
- Date
- 2014-05-10 22:30:54 -0700 (Sat, 10 May 2014)
Log Message
[WK2] URTBF after r168585.
* Platform/IPC/Connection.h:
* Shared/ChildProcessProxy.cpp:
(WebKit::ChildProcessProxy::terminate):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168594 => 168595)
--- trunk/Source/WebKit2/ChangeLog 2014-05-11 03:57:05 UTC (rev 168594)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-11 05:30:54 UTC (rev 168595)
@@ -1,3 +1,11 @@
+2014-05-10 Csaba Osztrogonác <[email protected]>
+
+ [WK2] URTBF after r168585.
+
+ * Platform/IPC/Connection.h:
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::terminate):
+
2014-05-10 Tim Horton <[email protected]>
[WKWebView _updateScrollViewBackground] churns UI-and-CGColors while repainting
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (168594 => 168595)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-11 03:57:05 UTC (rev 168594)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-11 05:30:54 UTC (rev 168595)
@@ -173,7 +173,9 @@
Identifier identifier() const;
+#if PLATFORM(COCOA)
bool kill();
+#endif
private:
Connection(Identifier, bool isServer, Client*, WTF::RunLoop& clientRunLoop);
Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp (168594 => 168595)
--- trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2014-05-11 03:57:05 UTC (rev 168594)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.cpp 2014-05-11 05:30:54 UTC (rev 168595)
@@ -65,8 +65,10 @@
void ChildProcessProxy::terminate()
{
+#if PLATFORM(COCOA)
if (m_connection && m_connection->kill())
return;
+#endif
// FIXME: We should really merge process launching into IPC connection creation and get rid of the process launcher.
if (m_processLauncher)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
