REGRESSION(r150491): WebKit2.CloseThenTerminate asserting below WebContext::disconnec...
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 May 2013 05:49:53 +0000 (05:49 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 May 2013 05:49:53 +0000 (05:49 +0000)
<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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebProcessProxy.cpp

index 5cbacbf..485e297 100644 (file)
@@ -1,3 +1,16 @@
+2013-05-21  Andreas Kling  <akling@apple.com>
+
+        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  <mrowe@apple.com>
 
         <rdar://problem/13915556> Sluggish scrolling in web content
index 0b87a07..35e4cd4 100644 (file)
@@ -656,6 +656,9 @@ void WebProcessProxy::releasePageCache()
 
 void WebProcessProxy::requestTermination()
 {
+    if (!isValid())
+        return;
+
     ChildProcessProxy::terminate();
 
     if (webConnection())