Changeset 249452 in webkit

Timestamp:

Sep 3, 2019 8:13:45 PM (5 years ago)

Author:

Chris Dumez

Message:

FrameLoader::FrameProgressTracker::progressCompleted() does not need a pageID
​https://bugs.webkit.org/show_bug.cgi?id=201431

Reviewed by Antti Koivisto.

Source/WebCore:

FrameLoader::FrameProgressTracker::progressCompleted() does not need to request a pageID
from the client. It can merely pass the Page object and the upper layers can very easily
get the identifier of that page.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::FrameProgressTracker::progressCompleted):

• loader/LoaderStrategy.h:

Source/WebKit:

• WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::pageLoadCompleted):

• WebProcess/Network/WebLoaderStrategy.h:

Source/WebKitLegacy:

• WebCoreSupport/WebResourceLoadScheduler.cpp:

(WebResourceLoadScheduler::pageLoadCompleted):

• WebCoreSupport/WebResourceLoadScheduler.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• WebCore/loader/LoaderStrategy.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Network/WebLoaderStrategy.cpp (modified) (1 diff)
• WebKit/WebProcess/Network/WebLoaderStrategy.h (modified) (1 diff)
• WebKitLegacy/ChangeLog (modified) (1 diff)
• WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp (modified) (1 diff)
• WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-03  Chris Dumez  <cdumez@apple.com>
+
+        FrameLoader::FrameProgressTracker::progressCompleted() does not need a pageID
+        https://bugs.webkit.org/show_bug.cgi?id=201431
+
+        Reviewed by Antti Koivisto.
+
+        FrameLoader::FrameProgressTracker::progressCompleted() does not need to request a pageID
+        from the client. It can merely pass the Page object and the upper layers can very easily
+        get the identifier of that page.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::FrameProgressTracker::progressCompleted):
+        * loader/LoaderStrategy.h:
+
 2019-09-03  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -258 +258 @@
         m_inProgress = false;
         m_frame.page()->progress().progressCompleted(m_frame);
-
-        if (auto pageID = m_frame.loader().client().pageID())
-            platformStrategies()->loaderStrategy()->pageLoadCompleted(pageID.value());
+        platformStrategies()->loaderStrategy()->pageLoadCompleted(*m_frame.page());
     }
 

trunk/Source/WebCore/loader/LoaderStrategy.h

@@ -45 +45 @@
 struct NetworkTransactionInformation;
 class NetworkLoadMetrics;
+class Page;
 class ResourceError;
 class ResourceLoader;
@@ -59 +60 @@
     virtual void loadResource(Frame&, CachedResource&, ResourceRequest&&, const ResourceLoaderOptions&, CompletionHandler<void(RefPtr<SubresourceLoader>&&)>&&) = 0;
     virtual void loadResourceSynchronously(FrameLoader&, unsigned long identifier, const ResourceRequest&, ClientCredentialPolicy, const FetchOptions&, const HTTPHeaderMap&, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
-    virtual void pageLoadCompleted(PageIdentifier) = 0;
+    virtual void pageLoadCompleted(Page&) = 0;
 
     virtual void remove(ResourceLoader*) = 0;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-03  Chris Dumez  <cdumez@apple.com>
+
+        FrameLoader::FrameProgressTracker::progressCompleted() does not need a pageID
+        https://bugs.webkit.org/show_bug.cgi?id=201431
+
+        Reviewed by Antti Koivisto.
+
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::WebLoaderStrategy::pageLoadCompleted):
+        * WebProcess/Network/WebLoaderStrategy.h:
+
 2019-09-03  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

@@ -584 +584 @@
 }
 
-void WebLoaderStrategy::pageLoadCompleted(PageIdentifier webPageID)
-{
-    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::PageLoadCompleted(webPageID), 0);
+void WebLoaderStrategy::pageLoadCompleted(Page& page)
+{
+    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::PageLoadCompleted(WebPage::fromCorePage(page).identifier()), 0);
 }
 

trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h

@@ -52 +52 @@
     void loadResource(WebCore::Frame&, WebCore::CachedResource&, WebCore::ResourceRequest&&, const WebCore::ResourceLoaderOptions&, CompletionHandler<void(RefPtr<WebCore::SubresourceLoader>&&)>&&) final;
     void loadResourceSynchronously(WebCore::FrameLoader&, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::ClientCredentialPolicy, const WebCore::FetchOptions&, const WebCore::HTTPHeaderMap&, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) final;
-    void pageLoadCompleted(WebCore::PageIdentifier) final;
+    void pageLoadCompleted(WebCore::Page&) final;
 
     void remove(WebCore::ResourceLoader*) final;

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2019-09-03  Chris Dumez  <cdumez@apple.com>
+
+        FrameLoader::FrameProgressTracker::progressCompleted() does not need a pageID
+        https://bugs.webkit.org/show_bug.cgi?id=201431
+
+        Reviewed by Antti Koivisto.
+
+        * WebCoreSupport/WebResourceLoadScheduler.cpp:
+        (WebResourceLoadScheduler::pageLoadCompleted):
+        * WebCoreSupport/WebResourceLoadScheduler.h:
+
 2019-08-30  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp

@@ -112 +112 @@
 }
 
-void WebResourceLoadScheduler::pageLoadCompleted(PageIdentifier)
+void WebResourceLoadScheduler::pageLoadCompleted(Page&)
 {
 }

trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.h

@@ -47 +47 @@
     void loadResource(WebCore::Frame&, WebCore::CachedResource&, WebCore::ResourceRequest&&, const WebCore::ResourceLoaderOptions&, CompletionHandler<void(RefPtr<WebCore::SubresourceLoader>&&)>&&) final;
     void loadResourceSynchronously(WebCore::FrameLoader&, unsigned long, const WebCore::ResourceRequest&, WebCore::ClientCredentialPolicy, const WebCore::FetchOptions&, const WebCore::HTTPHeaderMap&, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>&) final;
-    void pageLoadCompleted(WebCore::PageIdentifier) final;
+    void pageLoadCompleted(WebCore::Page&) final;
 
     void remove(WebCore::ResourceLoader*) final;