Changeset 242611 in webkit

Timestamp:

Mar 7, 2019 1:50:35 PM (5 years ago)

Author:

Chris Dumez

Message:

Regression(r242580) WebKit.NetworkProcessCrashWithPendingConnection API is crashing on iOS debug
​https://bugs.webkit.org/show_bug.cgi?id=195416

Reviewed by Antti Koivisto.

Drop ASSERT_NOT_REACHED() in WebPage::didCompletePageTransition() when the tree is still frozen due to
LayerTreeFreezeReason::ProcessSuspended. As demonstrated by this API test, nothing prevents a load from
completing and WebPage::didCompletePageTransition() to get called *after* WebProcess::prepareToSuspend()
has been called. From the logging during the test, I can tell that WebProcess::processDidResume() gets
called later on and the LayerTreeFreezeReason::ProcessSuspended freezing reason gets dropped, as expected.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCompletePageTransition):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-07  Chris Dumez  <cdumez@apple.com>
+
+        Regression(r242580) WebKit.NetworkProcessCrashWithPendingConnection API is crashing on iOS debug
+        https://bugs.webkit.org/show_bug.cgi?id=195416
+
+        Reviewed by Antti Koivisto.
+
+        Drop ASSERT_NOT_REACHED() in WebPage::didCompletePageTransition() when the tree is still frozen due to
+        LayerTreeFreezeReason::ProcessSuspended. As demonstrated by this API test, nothing prevents a load from
+        completing and WebPage::didCompletePageTransition() to get called *after* WebProcess::prepareToSuspend()
+        has been called. From the logging during the test, I can tell that WebProcess::processDidResume() gets
+        called later on and the LayerTreeFreezeReason::ProcessSuspended freezing reason gets dropped, as expected.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didCompletePageTransition):
+
 2019-03-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3145 +3145 @@
     unfreezeLayerTree(LayerTreeFreezeReason::PageTransition);
 
-    if (m_LayerTreeFreezeReasons.contains(LayerTreeFreezeReason::ProcessSuspended)) {
-        RELEASE_LOG_ERROR(ProcessSuspension, "%p - WebPage (PageID=%" PRIu64 ") - LayerTreeFreezeReason::ProcessSuspended was set when removing LayerTreeFreezeReason::PageTransition; current reasons are %d",
-            this, m_pageID, m_LayerTreeFreezeReasons.toRaw());
-        ASSERT_NOT_REACHED();
-    }
-
     RELEASE_LOG_IF_ALLOWED("%p - WebPage - Did complete page transition", this);