Changeset 228909 in webkit

Timestamp:

Feb 21, 2018 4:28:20 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Make SubstituteResource take a ResourceResponse r-value
​https://bugs.webkit.org/show_bug.cgi?id=183020

Patch by Youenn Fablet <​youenn@apple.com> on 2018-02-21
Reviewed by Alex Christensen.

No change of behavior.
Make SubstituteResource take a ResourceResponse r-value.
Update ArchiveResource accordingly.
Take benefit of that in ApplicationCacheResource to set the response source to ApplicationCache
before passing it to SubstituteResource constructor.

• loader/SubstituteResource.h:

(WebCore::SubstituteResource::SubstituteResource):
(WebCore::SubstituteResource::resourceResponse): Deleted.

• loader/appcache/ApplicationCacheResource.cpp:

(WebCore::ApplicationCacheResource::create):
(WebCore::ApplicationCacheResource::ApplicationCacheResource):

• loader/appcache/ApplicationCacheResource.h:

(WebCore::ApplicationCacheResource::create): Deleted.

• loader/archive/ArchiveResource.cpp:

(WebCore::ArchiveResource::ArchiveResource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubstituteResource.h (modified) (1 diff)
• loader/appcache/ApplicationCacheResource.cpp (modified) (2 diffs)
• loader/appcache/ApplicationCacheResource.h (modified) (2 diffs)
• loader/archive/ArchiveResource.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-21  Youenn Fablet  <youenn@apple.com>
+
+        Make SubstituteResource take a ResourceResponse r-value
+        https://bugs.webkit.org/show_bug.cgi?id=183020
+
+        Reviewed by Alex Christensen.
+
+        No change of behavior.
+        Make SubstituteResource take a ResourceResponse r-value.
+        Update ArchiveResource accordingly.
+        Take benefit of that in ApplicationCacheResource to set the response source to ApplicationCache
+        before passing it to SubstituteResource constructor.
+
+        * loader/SubstituteResource.h:
+        (WebCore::SubstituteResource::SubstituteResource):
+        (WebCore::SubstituteResource::resourceResponse): Deleted.
+        * loader/appcache/ApplicationCacheResource.cpp:
+        (WebCore::ApplicationCacheResource::create):
+        (WebCore::ApplicationCacheResource::ApplicationCacheResource):
+        * loader/appcache/ApplicationCacheResource.h:
+        (WebCore::ApplicationCacheResource::create): Deleted.
+        * loader/archive/ArchiveResource.cpp:
+        (WebCore::ArchiveResource::ArchiveResource):
+
 2018-02-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/loader/SubstituteResource.h

@@ -43 +43 @@
 
 protected:
-    SubstituteResource(const URL& url, const ResourceResponse& response, Ref<SharedBuffer>&& data)
-        : m_url(url)
-        , m_response(response)
+    SubstituteResource(URL&& url, ResourceResponse&& response, Ref<SharedBuffer>&& data)
+        : m_url(WTFMove(url))
+        , m_response(WTFMove(response))
         , m_data(WTFMove(data))
     {
     }
-
-    ResourceResponse& resourceResponse() { return m_response; }
 
 private:

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

@@ -30 +30 @@
 namespace WebCore {
 
-ApplicationCacheResource::ApplicationCacheResource(const URL& url, const ResourceResponse& response, unsigned type, Ref<SharedBuffer>&& data, const String& path)
-    : SubstituteResource(url, response, WTFMove(data))
+Ref<ApplicationCacheResource> ApplicationCacheResource::create(const URL& url, const ResourceResponse& response, unsigned type, RefPtr<SharedBuffer>&& buffer, const String& path)
+{
+    ASSERT(!url.hasFragmentIdentifier());
+    if (!buffer)
+        buffer = SharedBuffer::create();
+    auto resourceResponse = response;
+    resourceResponse.setSource(ResourceResponse::Source::ApplicationCache);
+
+    return adoptRef(*new ApplicationCacheResource(URL { url }, WTFMove(resourceResponse), type, buffer.releaseNonNull(), path));
+}
+
+ApplicationCacheResource::ApplicationCacheResource(URL&& url, ResourceResponse&& response, unsigned type, Ref<SharedBuffer>&& data, const String& path)
+    : SubstituteResource(WTFMove(url), WTFMove(response), WTFMove(data))
     , m_type(type)
     , m_storageID(0)
@@ -37 +48 @@
     , m_path(path)
 {
-    resourceResponse().setSource(ResourceResponse::Source::ApplicationCache);
 }
 

trunk/Source/WebCore/loader/appcache/ApplicationCacheResource.h

@@ -39 +39 @@
         Fallback = 1 << 4
     };
-        
-    static Ref<ApplicationCacheResource> create(const URL& url, const ResourceResponse& response, unsigned type, RefPtr<SharedBuffer> buffer = SharedBuffer::create(), const String& path = String())
-    {
-        ASSERT(!url.hasFragmentIdentifier());
-        if (!buffer)
-            buffer = SharedBuffer::create();
-        return adoptRef(*new ApplicationCacheResource(url, response, type, buffer.releaseNonNull(), path));
-    }
+
+    static Ref<ApplicationCacheResource> create(const URL&, const ResourceResponse&, unsigned type, RefPtr<SharedBuffer>&& = SharedBuffer::create(), const String& path = String());
 
     unsigned type() const { return m_type; }
@@ -64 +58 @@
     
 private:
-    ApplicationCacheResource(const URL&, const ResourceResponse&, unsigned type, Ref<SharedBuffer>&&, const String& path);
+    ApplicationCacheResource(URL&&, ResourceResponse&&, unsigned type, Ref<SharedBuffer>&&, const String& path);
 
     void deliver(ResourceLoader&) override;

trunk/Source/WebCore/loader/archive/ArchiveResource.cpp

@@ -35 +35 @@
 
 inline ArchiveResource::ArchiveResource(Ref<SharedBuffer>&& data, const URL& url, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse& response)
-    : SubstituteResource(url, response, WTFMove(data))
+    : SubstituteResource(URL { url }, ResourceResponse { response }, WTFMove(data))
     , m_mimeType(mimeType)
     , m_textEncoding(textEncoding)