Changeset 207190 in webkit

Timestamp:

Oct 11, 2016 11:26:35 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

MediaResourceLoader::requestResource should take a ResourceRequest&& as input
​https://bugs.webkit.org/show_bug.cgi?id=160397

Patch by Youenn Fablet <​youenn@apple.com> on 2016-10-11
Reviewed by Alex Christensen.

No change in behavior.

• loader/MediaResourceLoader.cpp:

(WebCore::MediaResourceLoader::requestResource): Passing a ResourceRequest&& as input parameter.

• loader/MediaResourceLoader.h:
• platform/graphics/PlatformMediaResourceLoader.h: Ditto.
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(webKitWebSrcStart): Creating an extra copy since MediaResourceLoader::requestResource expects a Resourcerequest&&.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/MediaResourceLoader.cpp (modified) (2 diffs)
• loader/MediaResourceLoader.h (modified) (1 diff)
• platform/graphics/PlatformMediaResourceLoader.h (modified) (1 diff)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-11  Youenn Fablet  <youenn@apple.com>
+
+        MediaResourceLoader::requestResource should take a ResourceRequest&& as input
+        https://bugs.webkit.org/show_bug.cgi?id=160397
+
+        Reviewed by Alex Christensen.
+
+        No change in behavior.
+
+        * loader/MediaResourceLoader.cpp:
+        (WebCore::MediaResourceLoader::requestResource): Passing a ResourceRequest&& as input parameter.
+        * loader/MediaResourceLoader.h:
+        * platform/graphics/PlatformMediaResourceLoader.h: Ditto.
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcStart): Creating an extra copy since MediaResourceLoader::requestResource expects a Resourcerequest&&.
+
 2016-10-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/MediaResourceLoader.cpp

@@ -58 +58 @@
 }
 
-RefPtr<PlatformMediaResource> MediaResourceLoader::requestResource(const ResourceRequest& request, LoadOptions options)
+RefPtr<PlatformMediaResource> MediaResourceLoader::requestResource(ResourceRequest&& request, LoadOptions options)
 {
     if (!m_document)
@@ -66 +66 @@
     auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching;
 
-    // FIXME: We should try to remove the copy of request when crearing cacheRequest.
-    // FIXME: Skip Content Security Policy check if the element that inititated this request is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
-    CachedResourceRequest cacheRequest(ResourceRequest(request), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, DoSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
+    // FIXME: Skip Content Security Policy check if the element that initiated this request is in a user-agent shadow tree. See <https://bugs.webkit.org/show_bug.cgi?id=155505>.
+    CachedResourceRequest cacheRequest(WTFMove(request), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, bufferingPolicy, AllowStoredCredentials, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, DoSecurityCheck, FetchOptions::Mode::NoCors, DoNotIncludeCertificateInfo, ContentSecurityPolicyImposition::DoPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, cachingPolicy));
 
     cacheRequest.setAsPotentiallyCrossOrigin(m_crossOriginMode, *m_document);

trunk/Source/WebCore/loader/MediaResourceLoader.h

@@ -47 +47 @@
     WEBCORE_EXPORT virtual ~MediaResourceLoader();
 
-    RefPtr<PlatformMediaResource> requestResource(const ResourceRequest&, LoadOptions) override;
+    RefPtr<PlatformMediaResource> requestResource(ResourceRequest&&, LoadOptions) final;
     void removeResource(MediaResource&);
 

trunk/Source/WebCore/platform/graphics/PlatformMediaResourceLoader.h

@@ -67 +67 @@
     virtual ~PlatformMediaResourceLoader() { }
 
-    virtual RefPtr<PlatformMediaResource> requestResource(const ResourceRequest&, LoadOptions) = 0;
+    virtual RefPtr<PlatformMediaResource> requestResource(ResourceRequest&&, LoadOptions) = 0;
 
 protected:

trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -581 +581 @@
         if (request.url().protocolIsBlob())
             loadOptions |= PlatformMediaResourceLoader::LoadOption::BufferData;
-        priv->resource = priv->loader->requestResource(request, loadOptions);
+        // FIXME: request should be moved for efficiency
+        priv->resource = priv->loader->requestResource(ResourceRequest(request), loadOptions);
         if (priv->resource) {
             priv->resource->setClient(std::make_unique<CachedResourceStreamingClient>(protector.get()));