Changeset 171211 in webkit

Timestamp:

Jul 17, 2014 7:16:00 PM (10 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r171167): LoaderClient processDidCrash call is made after load state changes
​https://bugs.webkit.org/show_bug.cgi?id=135032
<rdar://problem/17716602>

Reviewed by Dan Bernstein.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::processDidCrash): Create a transaction, so that the nested
transaction in resetStateAfterProcessExited() wouldn't be committed.
(WebKit::WebPageProxy::resetStateAfterProcessExited): Don't use auto - it was hiding
the most important fact that this is a stack object that can't be simply moved to
a different function.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-17  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r171167): LoaderClient processDidCrash call is made after load state changes
+        https://bugs.webkit.org/show_bug.cgi?id=135032
+        <rdar://problem/17716602>
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processDidCrash): Create a transaction, so that the nested
+        transaction in resetStateAfterProcessExited() wouldn't be committed.
+        (WebKit::WebPageProxy::resetStateAfterProcessExited): Don't use auto - it was hiding
+        the most important fact that this is a stack object that can't be simply moved to
+        a different function.
+
 2014-07-17  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4275 +4275 @@
     ASSERT(m_isValid);
 
+    // There is a nested transaction in resetStateAfterProcessExited() that we don't want to commit before the client call.
+    PageLoadState::Transaction transaction = m_pageLoadState.transaction();
+
     resetStateAfterProcessExited();
 
@@ -4432 +4435 @@
 #endif
 
-    auto transaction = m_pageLoadState.transaction();
+    PageLoadState::Transaction transaction = m_pageLoadState.transaction();
     m_pageLoadState.reset(transaction);
 }