Changeset 238817 in webkit

Timestamp:

Dec 3, 2018, 1:20:02 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Update process assertions after swapping processes
​https://bugs.webkit.org/show_bug.cgi?id=192318
<rdar://problem/46377552>

Reviewed by Chris Dumez.

If the previous WebProcess had a ProcessAssertion to prevent it from being suspended,
after navigation and process swapping we need the new WebProcess to update its process assertions.

• UIProcess/API/Cocoa/PageLoadStateObserver.h:
• UIProcess/Cocoa/NavigationState.h:
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::didSwapWebProcesses):

• UIProcess/PageLoadState.cpp:

(WebKit::PageLoadState::didSwapWebProcesses):

• UIProcess/PageLoadState.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::finishAttachingToWebProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/PageLoadStateObserver.h (modified) (1 diff)
• UIProcess/API/glib/WebKitWebView.cpp (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)
• UIProcess/PageLoadState.cpp (modified) (1 diff)
• UIProcess/PageLoadState.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-03  Alex Christensen  <achristensen@webkit.org>
+
+        Update process assertions after swapping processes
+        https://bugs.webkit.org/show_bug.cgi?id=192318
+        <rdar://problem/46377552>
+
+        Reviewed by Chris Dumez.
+
+        If the previous WebProcess had a ProcessAssertion to prevent it from being suspended,
+        after navigation and process swapping we need the new WebProcess to update its process assertions.
+
+        * UIProcess/API/Cocoa/PageLoadStateObserver.h:
+        * UIProcess/Cocoa/NavigationState.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::didSwapWebProcesses):
+        * UIProcess/PageLoadState.cpp:
+        (WebKit::PageLoadState::didSwapWebProcesses):
+        * UIProcess/PageLoadState.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::finishAttachingToWebProcess):
+
 2018-12-03  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/PageLoadStateObserver.h

@@ -98 +98 @@
     void willChangeCertificateInfo() override { }
     void didChangeCertificateInfo() override { }
+    void didSwapWebProcesses() override { }
 
     void willChangeWebProcessIsResponsive() override

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -355 +355 @@
     void willChangeWebProcessIsResponsive() override { }
     void didChangeWebProcessIsResponsive() override { }
+    void didSwapWebProcesses() override { };
 
     WebKitWebView* m_webView;

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

@@ -177 +177 @@
     void willChangeWebProcessIsResponsive() override;
     void didChangeWebProcessIsResponsive() override;
+    void didSwapWebProcesses() override;
 
 #if PLATFORM(IOS_FAMILY)

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

@@ -1227 +1227 @@
 }
 
+void NavigationState::didSwapWebProcesses()
+{
+#if PLATFORM(IOS_FAMILY)
+    // Transfer our background assertion from the old process to the new one.
+    if (m_activityToken)
+        m_activityToken = m_webView->_page->process().throttler().backgroundActivityToken();
+#endif
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit/UIProcess/PageLoadState.cpp

@@ -408 +408 @@
 }
 
+void PageLoadState::didSwapWebProcesses()
+{
+    callObserverCallback(&Observer::didSwapWebProcesses);
+}
+
 void PageLoadState::willChangeProcessIsResponsive()
 {

trunk/Source/WebKit/UIProcess/PageLoadState.h

@@ -79 +79 @@
         virtual void willChangeWebProcessIsResponsive() = 0;
         virtual void didChangeWebProcessIsResponsive() = 0;
+        
+        virtual void didSwapWebProcesses() = 0;
     };
 
@@ -165 +167 @@
     void didFinishProgress(const Transaction::Token&);
     void setNetworkRequestsInProgress(const Transaction::Token&, bool);
+
+    void didSwapWebProcesses();
 
     bool committedHasInsecureContent() const { return m_committedState.hasInsecureContent; }

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -853 +853 @@
 
     pageClient().didRelaunchProcess();
+    m_pageLoadState.didSwapWebProcesses();
     m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
 }