Title: [150500] trunk/Source/WebKit2
- Revision
- 150500
- Author
- [email protected]
- Date
- 2013-05-21 22:49:53 -0700 (Tue, 21 May 2013)
Log Message
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: trunk/Source/WebKit2/ChangeLog (150499 => 150500)
--- trunk/Source/WebKit2/ChangeLog 2013-05-22 03:07:20 UTC (rev 150499)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-22 05:49:53 UTC (rev 150500)
@@ -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-05-21 Mark Rowe <[email protected]>
<rdar://problem/13915556> Sluggish scrolling in web content
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (150499 => 150500)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-05-22 03:07:20 UTC (rev 150499)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-05-22 05:49:53 UTC (rev 150500)
@@ -656,6 +656,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
