Changeset 170776 in webkit

Timestamp:

Jul 3, 2014 4:31:15 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16337741> The UI process needs to track the number of HTTP subresource loads in progress (or at least whether there are any)
​https://bugs.webkit.org/show_bug.cgi?id=134615

Reviewed by Anders Carlsson.

Added a _networkRequestsInProgress boolean property to WKWebView.

• UIProcess/API/Cocoa/WKBrowsingContextController.mm: Added no-op overrides of new

PageLoadStateObserver member functions.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _networkRequestsInProgress]): New getter that gets this state from the
PageLoadState.

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new property.

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

(WebKit::NavigationState::willChangeNetworkRequestsInProgress):: Override this new
PageLoadState::Observer member function by sending the appropriate KVO change message to the
WKWebView.
(WebKit::NavigationState::didChangeNetworkRequestsInProgress): Ditto.

• UIProcess/PageLoadState.cpp:

(WebKit::PageLoadState::commitChanges): Check for changes to networkRequestsInProgress
and call the observers if needed.
(WebKit::PageLoadState::reset): Reset networkRequestsInProgress in the uncommitted state.
(WebKit::PageLoadState::setNetworkRequestsInProgress): Set networkRequestsInProgress in the
uncommitted state.

• UIProcess/PageLoadState.h:

(WebKit::PageLoadState::networkRequestsInProgress): Added this getter.
(WebKit::PageLoadState::Data::Data): Initialize new networkRequestsInProgress member.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setNetworkRequestsInProgress): Added. Updates the PageLoadState.

• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in: Added SetNetworkRequestsInProgress message.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::assignIdentifierToInitialRequest): Call
WebPage::addResourceRequest.
(WebKit::WebFrameLoaderClient::dispatchDidFinishLoading): Call
WebPage::removeResourceRequest.
(WebKit::WebFrameLoaderClient::dispatchDidFailLoading): Ditto.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::addResourceRequest): Added. If the new request is for an HTTP-family URL,
add its identifier to the set of network resourece request identifiers. If the set was
previously empty, send the WebPageProxy a message.
(WebKit::WebPage::removeResourceRequest): Added. Remove the identifier from the set. If it
becomes empty, send the WebPageProxy a message.

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.h (modified) (1 diff)
• UIProcess/Cocoa/NavigationState.mm (modified) (1 diff)
• UIProcess/PageLoadState.cpp (modified) (4 diffs)
• UIProcess/PageLoadState.h (modified) (5 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-03  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16337741> The UI process needs to track the number of HTTP subresource loads in progress (or at least whether there are any)
+        https://bugs.webkit.org/show_bug.cgi?id=134615
+
+        Reviewed by Anders Carlsson.
+
+        Added a _networkRequestsInProgress boolean property to WKWebView.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm: Added no-op overrides of new
+        PageLoadStateObserver member functions.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _networkRequestsInProgress]): New getter that gets this state from the
+        PageLoadState.
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new property.
+
+        * UIProcess/Cocoa/NavigationState.h:
+        * UIProcess/Cocoa/NavigationState.mm:
+        (WebKit::NavigationState::willChangeNetworkRequestsInProgress):: Override this new
+        PageLoadState::Observer member function by sending the appropriate KVO change message to the
+        WKWebView.
+        (WebKit::NavigationState::didChangeNetworkRequestsInProgress): Ditto.
+
+        * UIProcess/PageLoadState.cpp:
+        (WebKit::PageLoadState::commitChanges): Check for changes to networkRequestsInProgress
+        and call the observers if needed.
+        (WebKit::PageLoadState::reset): Reset networkRequestsInProgress in the uncommitted state.
+        (WebKit::PageLoadState::setNetworkRequestsInProgress): Set networkRequestsInProgress in the
+        uncommitted state.
+        * UIProcess/PageLoadState.h:
+        (WebKit::PageLoadState::networkRequestsInProgress): Added this getter.
+        (WebKit::PageLoadState::Data::Data): Initialize new networkRequestsInProgress member.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setNetworkRequestsInProgress): Added. Updates the PageLoadState.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in: Added SetNetworkRequestsInProgress message.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::assignIdentifierToInitialRequest): Call
+        WebPage::addResourceRequest.
+        (WebKit::WebFrameLoaderClient::dispatchDidFinishLoading): Call
+        WebPage::removeResourceRequest.
+        (WebKit::WebFrameLoaderClient::dispatchDidFailLoading): Ditto.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::addResourceRequest): Added. If the new request is for an HTTP-family URL,
+        add its identifier to the set of network resourece request identifiers. If the set was
+        previously empty, send the WebPageProxy a message.
+        (WebKit::WebPage::removeResourceRequest): Added. Remove the identifier from the set. If it
+        becomes empty, send the WebPageProxy a message.
+        * WebProcess/WebPage/WebPage.h:
+
 2014-07-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -125 +125 @@
     virtual void willChangeCanGoForward() override { }
     virtual void didChangeCanGoForward() override { }
+    virtual void willChangeNetworkRequestsInProgress() override { }
+    virtual void didChangeNetworkRequestsInProgress() override { }
 
     WKBrowsingContextController *m_controller;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1652 +1652 @@
 }
 
+- (BOOL)_networkRequestsInProgress
+{
+    return _page->pageLoadState().networkRequestsInProgress();
+}
+
 static inline WebCore::LayoutMilestones layoutMilestones(_WKRenderingProgressEvents events)
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -97 +97 @@
 @property (nonatomic, setter=_setAddsVisitedLinks:) BOOL _addsVisitedLinks;
 
+@property (nonatomic, readonly) BOOL _networkRequestsInProgress;
+
 - (void)_close;
 

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

@@ -132 +132 @@
     virtual void willChangeCanGoForward() override;
     virtual void didChangeCanGoForward() override;
+    virtual void willChangeNetworkRequestsInProgress() override;
+    virtual void didChangeNetworkRequestsInProgress() override;
 
     WKWebView *m_webView;

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

@@ -798 +798 @@
 }
 
+void NavigationState::willChangeNetworkRequestsInProgress()
+{
+    [m_webView willChangeValueForKey:@"_networkRequestsInProgress"];
+}
+
+void NavigationState::didChangeNetworkRequestsInProgress()
+{
+    [m_webView didChangeValueForKey:@"_networkRequestsInProgress"];
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/UIProcess/PageLoadState.cpp

@@ -103 +103 @@
     bool hasOnlySecureContentChanged = hasOnlySecureContent(m_committedState) != hasOnlySecureContent(m_uncommittedState);
     bool estimatedProgressChanged = estimatedProgress(m_committedState) != estimatedProgress(m_uncommittedState);
+    bool networkRequestsInProgressChanged = m_committedState.networkRequestsInProgress != m_uncommittedState.networkRequestsInProgress;
 
     if (canGoBackChanged)
@@ -118 +119 @@
     if (estimatedProgressChanged)
         callObserverCallback(&Observer::willChangeEstimatedProgress);
+    if (networkRequestsInProgressChanged)
+        callObserverCallback(&Observer::willChangeNetworkRequestsInProgress);
 
     m_committedState = m_uncommittedState;
 
     // The "did" ordering is the reverse of the "will". This is a requirement of Cocoa Key-Value Observing.
+    if (networkRequestsInProgressChanged)
+        callObserverCallback(&Observer::didChangeNetworkRequestsInProgress);
     if (estimatedProgressChanged)
         callObserverCallback(&Observer::didChangeEstimatedProgress);
@@ -155 +160 @@
 
     m_uncommittedState.estimatedProgress = 0;
+    m_uncommittedState.networkRequestsInProgress = false;
 }
 
@@ -369 +375 @@
 }
 
+void PageLoadState::setNetworkRequestsInProgress(const Transaction::Token& token, bool networkRequestsInProgress)
+{
+    ASSERT_UNUSED(token, &token.m_pageLoadState == this);
+    m_uncommittedState.networkRequestsInProgress = networkRequestsInProgress;
+}
+
 bool PageLoadState::isLoading(const Data& data)
 {

trunk/Source/WebKit2/UIProcess/PageLoadState.h

@@ -68 +68 @@
         virtual void willChangeCanGoForward() = 0;
         virtual void didChangeCanGoForward() = 0;
+
+        virtual void willChangeNetworkRequestsInProgress() = 0;
+        virtual void didChangeNetworkRequestsInProgress() = 0;
     };
 
@@ -119 +122 @@
 
     double estimatedProgress() const;
+    bool networkRequestsInProgress() const { return m_committedState.networkRequestsInProgress; }
 
     const String& pendingAPIRequestURL() const;
@@ -150 +154 @@
     void didChangeProgress(const Transaction::Token&, double);
     void didFinishProgress(const Transaction::Token&);
+    void setNetworkRequestsInProgress(const Transaction::Token&, bool);
 
 private:
@@ -166 +171 @@
             , canGoForward(false)
             , estimatedProgress(0)
+            , networkRequestsInProgress(false)
         {
         }
@@ -185 +191 @@
 
         double estimatedProgress;
+        bool networkRequestsInProgress;
     };
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2443 +2443 @@
 }
 
+void WebPageProxy::setNetworkRequestsInProgress(bool networkRequestsInProgress)
+{
+    auto transaction = m_pageLoadState.transaction();
+    m_pageLoadState.setNetworkRequestsInProgress(transaction, networkRequestsInProgress);
+}
+
 void WebPageProxy::didDestroyNavigation(uint64_t navigationID)
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -957 +957 @@
     void didChangeProgress(double);
     void didFinishProgress();
+    void setNetworkRequestsInProgress(bool);
+
     void didDestroyNavigation(uint64_t navigationID);
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -120 +120 @@
     DidStartProgress()
 
+    SetNetworkRequestsInProgress(bool networkRequestsInProgress)
+
     # Frame lifetime messages
     DidCreateMainFrame(uint64_t frameID)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -170 +170 @@
 
     webPage->injectedBundleResourceLoadClient().didInitiateLoadForResource(webPage, m_frame, identifier, request, pageIsProvisionallyLoading);
+    webPage->addResourceRequest(identifier, request);
 }
 
@@ -250 +251 @@
 
     webPage->injectedBundleResourceLoadClient().didFinishLoadForResource(webPage, m_frame, identifier);
+    webPage->removeResourceRequest(identifier);
 }
 
@@ -259 +261 @@
 
     webPage->injectedBundleResourceLoadClient().didFailLoadForResource(webPage, m_frame, identifier, error);
+    webPage->removeResourceRequest(identifier);
 }
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -3807 +3807 @@
 #endif
 
+void WebPage::addResourceRequest(unsigned long identifier, const WebCore::ResourceRequest& request)
+{
+    if (!request.url().protocolIsInHTTPFamily())
+        return;
+
+    ASSERT(!m_networkResourceRequestIdentifiers.contains(identifier));
+    bool wasEmpty = m_networkResourceRequestIdentifiers.isEmpty();
+    m_networkResourceRequestIdentifiers.add(identifier);
+    if (wasEmpty)
+        send(Messages::WebPageProxy::SetNetworkRequestsInProgress(true));
+}
+
+void WebPage::removeResourceRequest(unsigned long identifier)
+{
+    if (!m_networkResourceRequestIdentifiers.remove(identifier))
+        return;
+
+    if (m_networkResourceRequestIdentifiers.isEmpty())
+        send(Messages::WebPageProxy::SetNetworkRequestsInProgress(false));
+}
+
 void WebPage::setMediaVolume(float volume)
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -691 +691 @@
 #endif
 
+    void addResourceRequest(unsigned long, const WebCore::ResourceRequest&);
+    void removeResourceRequest(unsigned long);
+
     void setMediaVolume(float);
     void setMayStartMediaWhenInWindow(bool);
@@ -1201 +1204 @@
     unsigned m_cachedPageCount;
 
+    HashSet<unsigned long> m_networkResourceRequestIdentifiers;
+
     WebCore::IntSize m_minimumLayoutSize;
     bool m_autoSizingShouldExpandToViewHeight;