Changeset 168441 in webkit

Timestamp:

May 7, 2014, 2:57:06 PM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16831276> [iOS] Unparenting a WKWebView that’s loading pauses it
​https://bugs.webkit.org/show_bug.cgi?id=132659

Reviewed by Tim Horton.

• UIProcess/Cocoa/NavigationState.h: Added a member variable.
• UIProcess/Cocoa/NavigationState.mm:

(WebKit::NavigationState::didChangeIsLoading): When transitioning into loading state,
acquire a background activity token. When transitioning out of loading state, dispose of
the token.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-07  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16831276> [iOS] Unparenting a WKWebView that’s loading pauses it
+        https://bugs.webkit.org/show_bug.cgi?id=132659
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/Cocoa/NavigationState.h: Added a member variable.
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::didChangeIsLoading): When transitioning into loading state,
+        acquire a background activity token. When transitioning out of loading state, dispose of
+        the token.
+
 2014-05-07  Jeremy Jones  <jeremyj@apple.com>
 

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

@@ -36 +36 @@
 #import "APIPolicyClient.h"
 #import "PageLoadState.h"
+#import "ProcessThrottler.h"
 #import "WeakObjCPtr.h"
 
@@ -160 +161 @@
         bool webViewDidUpdateHistoryTitleForURL : 1;
     } m_historyDelegateMethods;
+
+#if PLATFORM(IOS)
+    std::unique_ptr<ProcessThrottler::BackgroundActivityToken> m_activityToken;
+#endif
 };
 

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

@@ -52 +52 @@
 #import "WebFrameProxy.h"
 #import "WebPageProxy.h"
+#import "WebProcessProxy.h"
 #import <wtf/NeverDestroyed.h>
 
@@ -626 +627 @@
 void NavigationState::didChangeIsLoading()
 {
+#if PLATFORM(IOS)
+    if (m_webView->_page->pageLoadState().isLoading())
+        m_activityToken = std::make_unique<ProcessThrottler::BackgroundActivityToken>(m_webView->_page->process().throttler());
+    else
+        m_activityToken = nullptr;
+#endif
+
     [m_webView didChangeValueForKey:@"loading"];
 }