Title: [237041] tags/Safari-607.1.10.2/Source/WebKit
Revision
237041
Author
[email protected]
Date
2018-10-11 11:56:08 -0700 (Thu, 11 Oct 2018)

Log Message

Cherry-pick r236989. rdar://problem/43391014

    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.

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

Modified Paths

Diff

Modified: tags/Safari-607.1.10.2/Source/WebKit/ChangeLog (237040 => 237041)


--- tags/Safari-607.1.10.2/Source/WebKit/ChangeLog	2018-10-11 18:39:05 UTC (rev 237040)
+++ tags/Safari-607.1.10.2/Source/WebKit/ChangeLog	2018-10-11 18:56:08 UTC (rev 237041)
@@ -1,3 +1,33 @@
+2018-10-11  Kocsen Chung  <[email protected]>
+
+        Cherry-pick r236989. rdar://problem/43391014
+
+    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.
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-10-09  Alex Christensen  <[email protected]>
+
+            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-08  Kocsen Chung  <[email protected]>
 
         Revert r236875. rdar://problem/45109065

Modified: tags/Safari-607.1.10.2/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (237040 => 237041)


--- tags/Safari-607.1.10.2/Source/WebKit/UIProcess/Cocoa/NavigationState.mm	2018-10-11 18:39:05 UTC (rev 237040)
+++ tags/Safari-607.1.10.2/Source/WebKit/UIProcess/Cocoa/NavigationState.mm	2018-10-11 18:56:08 UTC (rev 237041)
@@ -1104,14 +1104,10 @@
             m_activityToken = m_webView->_page->process().throttler().backgroundActivityToken();
         }
     } 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
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to