Changeset 236989 in webkit

Timestamp:

Oct 9, 2018 4:40:21 PM (6 years ago)

Author:

achristensen@apple.com

Message:

REGRESSION(r231663) loading in hidden WKWebViews stalls because WebProcess is suspended
​https://bugs.webkit.org/show_bug.cgi?id=190417
<rdar://problem/43391014>

Reviewed by Chris Dumez.

• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::didChangeIsLoading):
Revert r321663, but keep the change to TestWKWebView.mm because that made the tests more reliable.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-10-09  Alex Christensen  <achristensen@webkit.org>
+
+        REGRESSION(r231663) loading in hidden WKWebViews stalls because WebProcess is suspended
+        https://bugs.webkit.org/show_bug.cgi?id=190417
+        <rdar://problem/43391014>
+
+        Reviewed by Chris Dumez.
+
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::didChangeIsLoading):
+        Revert r321663, but keep the change to TestWKWebView.mm because that made the tests more reliable.
+
 2018-10-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm

@@ -1105 +1105 @@
         }
     } else if (m_activityToken) {
-        if (m_webView._isBackground)
-            releaseNetworkActivityTokenAfterLoadCompletion();
-        else {
-            // The application is visible so we delay releasing the background activity for 3 seconds to give it a chance to start another navigation
-            // before suspending the WebContent process <rdar://problem/27910964>.
-            RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState will release its process network assertion soon because the page load completed", this);
-            m_releaseActivityTimer.startOneShot(3_s);
-        }
+        // The application is visible so we delay releasing the background activity for 3 seconds to give it a chance to start another navigation
+        // before suspending the WebContent process <rdar://problem/27910964>.
+        RELEASE_LOG_IF(m_webView->_page->isAlwaysOnLoggingAllowed(), ProcessSuspension, "%p - NavigationState will release its process network assertion soon because the page load completed", this);
+        m_releaseActivityTimer.startOneShot(3_s);
     }
 #endif