Title: [151374] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 151374
- Author
- [email protected]
- Date
- 2013-06-10 03:03:44 -0700 (Mon, 10 Jun 2013)
Log Message
Merge r150500 - REGRESSION(r150491): WebKit2.CloseThenTerminate asserting below WebContext::disconnectProcess().
<http://webkit.org/b/116588>
Reviewed by Sam Weinig.
Do an early return from WebProcessProxy::requestTermination() if there is no child process
connection to terminate.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::requestTermination):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (151373 => 151374)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-10 10:00:06 UTC (rev 151373)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-10 10:03:44 UTC (rev 151374)
@@ -1,3 +1,16 @@
+2013-05-21 Andreas Kling <[email protected]>
+
+ REGRESSION(r150491): WebKit2.CloseThenTerminate asserting below WebContext::disconnectProcess().
+ <http://webkit.org/b/116588>
+
+ Reviewed by Sam Weinig.
+
+ Do an early return from WebProcessProxy::requestTermination() if there is no child process
+ connection to terminate.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::requestTermination):
+
2013-06-06 Rafael Brandao <[email protected]>
[Gtk] Connection is leaking when WebProcess is terminated
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/WebProcessProxy.cpp (151373 => 151374)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-06-10 10:00:06 UTC (rev 151373)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-06-10 10:03:44 UTC (rev 151374)
@@ -637,6 +637,9 @@
void WebProcessProxy::requestTermination()
{
+ if (!isValid())
+ return;
+
ChildProcessProxy::terminate();
if (webConnection())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes