Changeset 260596 in webkit

Timestamp:

Apr 23, 2020 1:37:54 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Move applyUserAgentIfNeeded calls to a more central place
​https://bugs.webkit.org/show_bug.cgi?id=209587

Patch by Rob Buis <​rbuis@igalia.com> on 2020-04-23
Reviewed by Darin Adler.

Make main resource loads stop calling applyUserAgentIfNeeded
and instead do it in the CachedResourceLoader.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::addExtraFieldsToRequest):
(WebCore::FrameLoader::loadResourceSynchronously):

• loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::createRequest):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::updateHTTPRequestHeaders):
(WebCore::CachedResourceLoader::requestResource):

• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedResourceRequest.cpp:

(WebCore::CachedResourceRequest::updateReferrerAndOriginHeaders):
(WebCore::CachedResourceRequest::updateUserAgentHeader):
(WebCore::CachedResourceRequest::updateReferrerOriginAndUserAgentHeaders): Deleted.

• loader/cache/CachedResourceRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.h (modified) (1 diff)
• loader/cache/CachedResourceRequest.cpp (modified) (3 diffs)
• loader/cache/CachedResourceRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-23  Rob Buis  <rbuis@igalia.com>
+
+        Move applyUserAgentIfNeeded calls to a more central place
+        https://bugs.webkit.org/show_bug.cgi?id=209587
+
+        Reviewed by Darin Adler.
+
+        Make main resource loads stop calling applyUserAgentIfNeeded
+        and instead do it in the CachedResourceLoader.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::addExtraFieldsToRequest):
+        (WebCore::FrameLoader::loadResourceSynchronously):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::createRequest):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::updateHTTPRequestHeaders):
+        (WebCore::CachedResourceLoader::requestResource):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedResourceRequest.cpp:
+        (WebCore::CachedResourceRequest::updateReferrerAndOriginHeaders):
+        (WebCore::CachedResourceRequest::updateUserAgentHeader):
+        (WebCore::CachedResourceRequest::updateReferrerOriginAndUserAgentHeaders): Deleted.
+        * loader/cache/CachedResourceRequest.h:
+
 2020-04-23  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2963 +2963 @@
         request.setPriority(m_overrideResourceLoadPriorityForTesting.value());
 
-    applyUserAgentIfNeeded(request);
-
     // Only set fallback array if it's still empty (later attempts may be incorrect, see bug 117818).
     if (request.responseContentDispositionEncodingFallbackArray().isEmpty()) {
@@ -3066 +3064 @@
     
     addExtraFieldsToRequest(initialRequest, IsMainResource::No);
+
+    applyUserAgentIfNeeded(initialRequest);
 
     unsigned long identifier = 0;    

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -464 +464 @@
 {
     ResourceRequest request { WTFMove(url) };
-    m_frame->loader().applyUserAgentIfNeeded(request);
     request.setHTTPHeaderField(HTTPHeaderName::CacheControl, HTTPHeaderValues::maxAge0());
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -735 +735 @@
 }
 
-void CachedResourceLoader::updateHTTPRequestHeaders(CachedResource::Type type, CachedResourceRequest& request)
+void CachedResourceLoader::updateHTTPRequestHeaders(FrameLoader& frameLoader, CachedResource::Type type, CachedResourceRequest& request)
 {
     // Implementing steps 7 to 12 of https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
 
     // FIXME: We should reconcile handling of MainResource with other resources.
-    if (type != CachedResource::Type::MainResource) {
-        // In some cases we may try to load resources in frameless documents. Such loads always fail.
-        // FIXME: We shouldn't need to do the check on frame.
-        if (auto* frame = this->frame())
-            request.updateReferrerOriginAndUserAgentHeaders(frame->loader());
-    }
+    if (type != CachedResource::Type::MainResource)
+        request.updateReferrerAndOriginHeaders(frameLoader);
+    request.updateUserAgentHeader(frameLoader);
 
     request.updateAccordingCacheMode();
@@ -910 +907 @@
 
     if (request.resourceRequest().url().protocolIsInHTTPFamily())
-        updateHTTPRequestHeaders(type, request);
+        updateHTTPRequestHeaders(frame.loader(), type, request);
 
     auto& memoryCache = MemoryCache::singleton();

trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -176 +176 @@
 
     void prepareFetch(CachedResource::Type, CachedResourceRequest&);
-    void updateHTTPRequestHeaders(CachedResource::Type, CachedResourceRequest&);
+    void updateHTTPRequestHeaders(FrameLoader&, CachedResource::Type, CachedResourceRequest&);
 
     bool canRequest(CachedResource::Type, const URL&, const CachedResourceRequest&, ForPreload);

trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp

@@ -222 +222 @@
 }
 
-void CachedResourceRequest::updateReferrerOriginAndUserAgentHeaders(FrameLoader& frameLoader)
+void CachedResourceRequest::updateReferrerAndOriginHeaders(FrameLoader& frameLoader)
 {
     // Implementing step 9 to 11 of https://fetch.spec.whatwg.org/#http-network-or-cache-fetch as of 16 March 2018
@@ -229 +229 @@
         outgoingReferrer = m_resourceRequest.httpReferrer();
     updateRequestReferrer(m_resourceRequest, m_options.referrerPolicy, outgoingReferrer);
-    frameLoader.applyUserAgentIfNeeded(m_resourceRequest);
 
     if (doesRequestNeedHTTPOriginHeader(m_resourceRequest)) {
@@ -238 +237 @@
 }
 
+void CachedResourceRequest::updateUserAgentHeader(FrameLoader& frameLoader)
+{
+    frameLoader.applyUserAgentIfNeeded(m_resourceRequest);
+}
+
 bool isRequestCrossOrigin(SecurityOrigin* origin, const URL& requestURL, const ResourceLoaderOptions& options)
 {

trunk/Source/WebCore/loader/cache/CachedResourceRequest.h

@@ -79 +79 @@
 
     void updateReferrerPolicy(ReferrerPolicy);
-    void updateReferrerOriginAndUserAgentHeaders(FrameLoader&);
+    void updateReferrerAndOriginHeaders(FrameLoader&);
+    void updateUserAgentHeader(FrameLoader&);
     void upgradeInsecureRequestIfNeeded(Document&);
     void setAcceptHeaderIfNone(CachedResource::Type);