Changeset 223933 in webkit

Timestamp:

Oct 24, 2017 3:20:59 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Optionally store entire ResourceRequest for ping loads
​https://bugs.webkit.org/show_bug.cgi?id=178756

Reviewed by Tim Horton.

No change in behavior.
This uses less memory in the common loading case.
This will be needed for moving appcache loading to the Networking Process.
See ​https://bugs.webkit.org/show_bug.cgi?id=178540

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::load):

• loader/cache/CachedResource.h:

(WebCore::CachedResource::setOriginalRequest):
(WebCore::CachedResource::originalRequest const):
(WebCore::CachedResource::setOriginalRequestHeaders): Deleted.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResource.cpp (modified) (2 diffs)
• loader/cache/CachedResource.h (modified) (2 diffs)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-24  Alex Christensen  <achristensen@webkit.org>
+
+        Optionally store entire ResourceRequest for ping loads
+        https://bugs.webkit.org/show_bug.cgi?id=178756
+
+        Reviewed by Tim Horton.
+
+        No change in behavior.
+        This uses less memory in the common loading case.
+        This will be needed for moving appcache loading to the Networking Process.
+        See https://bugs.webkit.org/show_bug.cgi?id=178540
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::load):
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::setOriginalRequest):
+        (WebCore::CachedResource::originalRequest const):
+        (WebCore::CachedResource::setOriginalRequestHeaders): Deleted.
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+
 2017-10-24  Andy Estes  <aestes@apple.com>
 

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

@@ -270 +270 @@
         // FIXME: We should not special-case Beacon here.
         if (shouldUsePingLoad(type())) {
-            ASSERT(m_originalRequestHeaders);
+            ASSERT(m_originalRequest);
             CachedResourceHandle<CachedResource> protectedThis(this);
 
@@ -277 +277 @@
             InspectorInstrumentation::willSendRequestOfType(&frame, identifier, frameLoader.activeDocumentLoader(), request, InspectorInstrumentation::LoadType::Beacon);
 
-            platformStrategies()->loaderStrategy()->startPingLoad(frame, request, *m_originalRequestHeaders, m_options, [this, protectedThis = WTFMove(protectedThis), protectedFrame = makeRef(frame), identifier] (const ResourceError& error, const ResourceResponse& response) {
+            platformStrategies()->loaderStrategy()->startPingLoad(frame, request, m_originalRequest->httpHeaderFields(), m_options, [this, protectedThis = WTFMove(protectedThis), protectedFrame = makeRef(frame), identifier] (const ResourceError& error, const ResourceResponse& response) {
                 if (!response.isNull())
                     InspectorInstrumentation::didReceiveResourceResponse(protectedFrame, identifier, protectedFrame->loader().activeDocumentLoader(), response, nullptr);

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

@@ -284 +284 @@
     static ResourceLoadPriority defaultPriorityForResourceType(Type);
 
-    void setOriginalRequestHeaders(std::optional<HTTPHeaderMap>&& originalRequestHeaders) { m_originalRequestHeaders = WTFMove(originalRequestHeaders); }
+    void setOriginalRequest(std::unique_ptr<ResourceRequest>&& originalRequest) { m_originalRequest = WTFMove(originalRequest); }
+    const std::unique_ptr<ResourceRequest>& originalRequest() const { return m_originalRequest; }
 
 protected:
@@ -301 +302 @@
     HashCountedSet<CachedResourceClient*> m_clients;
     ResourceRequest m_resourceRequest;
-    std::optional<HTTPHeaderMap> m_originalRequestHeaders; // Needed by Ping loads.
+    std::unique_ptr<ResourceRequest> m_originalRequest; // Needed by Ping loads.
     RefPtr<SubresourceLoader> m_loader;
     ResourceLoaderOptions m_options;

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

@@ -714 +714 @@
 ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requestResource(CachedResource::Type type, CachedResourceRequest&& request, ForPreload forPreload, DeferOption defer)
 {
-    std::optional<HTTPHeaderMap> originalRequestHeaders;
+    std::unique_ptr<ResourceRequest> originalRequest;
     if (CachedResource::shouldUsePingLoad(type))
-        originalRequestHeaders = request.resourceRequest().httpHeaderFields();
+        originalRequest = std::make_unique<ResourceRequest>(request.resourceRequest());
 
     if (Document* document = this->document())
@@ -861 +861 @@
     }
     ASSERT(resource);
-    resource->setOriginalRequestHeaders(WTFMove(originalRequestHeaders));
+    resource->setOriginalRequest(WTFMove(originalRequest));
 
     if (forPreload == ForPreload::No && resource->loader() && resource->ignoreForRequestCount()) {