Changeset 210514 in webkit

Timestamp:

Jan 9, 2017 10:26:58 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Merging ThreadableLoader redundant options on filtering responses

Merge OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options
​https://bugs.webkit.org/show_bug.cgi?id=166843

Patch by Youenn Fablet <​youennf@gmail.com> on 2017-01-09
Reviewed by Darin Adler.

Covered by existing tests.

Removing OpaqueResponseBodyPolicy option.
When ResponseFilteringPolicy is set to Enable, the body is filtered out in DocumentThreadableLoader.

• Modules/fetch/FetchLoader.cpp:

(WebCore::FetchLoader::start):

• loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::didReceiveResponse): Implementing body filtering based on ResponseFilteringPolicy option.

• loader/ThreadableLoader.cpp:

(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):

• loader/ThreadableLoader.h:
• loader/WorkerThreadableLoader.cpp:

(WebCore::LoaderTaskOptions::LoaderTaskOptions):

• workers/WorkerScriptLoader.cpp:

(WebCore::WorkerScriptLoader::loadSynchronously):
(WebCore::WorkerScriptLoader::loadAsynchronously):

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::createRequest):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/fetch/FetchLoader.cpp (modified) (1 diff)
• loader/DocumentThreadableLoader.cpp (modified) (1 diff)
• loader/ThreadableLoader.cpp (modified) (1 diff)
• loader/ThreadableLoader.h (modified) (3 diffs)
• loader/WorkerThreadableLoader.cpp (modified) (1 diff)
• workers/WorkerScriptLoader.cpp (modified) (2 diffs)
• xml/XMLHttpRequest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-09  Youenn Fablet  <youennf@gmail.com>
+
+        Merging ThreadableLoader redundant options on filtering responses
+
+        Merge OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options
+        https://bugs.webkit.org/show_bug.cgi?id=166843
+
+        Reviewed by Darin Adler.
+
+        Covered by existing tests.
+
+        Removing OpaqueResponseBodyPolicy option.
+        When ResponseFilteringPolicy is set to Enable, the body is filtered out in DocumentThreadableLoader.
+
+        * Modules/fetch/FetchLoader.cpp:
+        (WebCore::FetchLoader::start):
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::didReceiveResponse): Implementing body filtering based on ResponseFilteringPolicy option.
+        * loader/ThreadableLoader.cpp:
+        (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):
+        * loader/ThreadableLoader.h:
+        * loader/WorkerThreadableLoader.cpp:
+        (WebCore::LoaderTaskOptions::LoaderTaskOptions):
+        * workers/WorkerScriptLoader.cpp:
+        (WebCore::WorkerScriptLoader::loadSynchronously):
+        (WebCore::WorkerScriptLoader::loadAsynchronously):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest):
+
 2017-01-09  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp

@@ -78 +78 @@
         context.shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective,
         String(cachedResourceRequestInitiators().fetch),
-        OpaqueResponseBodyPolicy::DoNotReceive, ResponseFilteringPolicy::Enable);
+        ResponseFilteringPolicy::Enable);
     options.sendLoadCallbacks = SendCallbacks;
     options.dataBufferingPolicy = DoNotBufferData;

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -282 +282 @@
 {
     ASSERT(m_client);
+    ASSERT(response.type() != ResourceResponse::Type::Error);
 
     InspectorInstrumentation::didReceiveThreadableLoaderResponse(*this, identifier);
 
-    ASSERT(response.type() != ResourceResponse::Type::Error);
+    if (options().filteringPolicy == ResponseFilteringPolicy::Disable) {
+        m_client->didReceiveResponse(identifier, response);
+        return;
+    }
+
     if (response.type() == ResourceResponse::Type::Default) {
-        m_client->didReceiveResponse(identifier, options().filteringPolicy == ResponseFilteringPolicy::Enable ? ResourceResponse::filterResponse(response, tainting) : response);
-        if (tainting == ResourceResponse::Tainting::Opaque && options().opaqueResponse == OpaqueResponseBodyPolicy::DoNotReceive) {
+        m_client->didReceiveResponse(identifier, ResourceResponse::filterResponse(response, tainting));
+        if (tainting == ResourceResponse::Tainting::Opaque) {
             clearResource();
             if (m_client)

trunk/Source/WebCore/loader/ThreadableLoader.cpp

@@ -53 +53 @@
 }
 
-ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, String&& initiator, OpaqueResponseBodyPolicy opaqueResponse, ResponseFilteringPolicy filteringPolicy)
+ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions& baseOptions, PreflightPolicy preflightPolicy, ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement, String&& initiator, ResponseFilteringPolicy filteringPolicy)
     : ResourceLoaderOptions(baseOptions)
     , preflightPolicy(preflightPolicy)
     , contentSecurityPolicyEnforcement(contentSecurityPolicyEnforcement)
     , initiator(WTFMove(initiator))
-    , opaqueResponse(opaqueResponse)
     , filteringPolicy(filteringPolicy)
 {

trunk/Source/WebCore/loader/ThreadableLoader.h

@@ -58 +58 @@
     };
 
-    enum class OpaqueResponseBodyPolicy {
-        Receive,
-        DoNotReceive
-    };
-
     enum class ResponseFilteringPolicy {
         Enable,
@@ -70 +65 @@
     struct ThreadableLoaderOptions : ResourceLoaderOptions {
         ThreadableLoaderOptions();
-        ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, ContentSecurityPolicyEnforcement, String&& initiator, OpaqueResponseBodyPolicy, ResponseFilteringPolicy);
+        ThreadableLoaderOptions(const ResourceLoaderOptions&, PreflightPolicy, ContentSecurityPolicyEnforcement, String&& initiator, ResponseFilteringPolicy);
         ~ThreadableLoaderOptions();
 
@@ -76 +71 @@
         ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement { ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective };
         String initiator; // This cannot be an AtomicString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread.
-        OpaqueResponseBodyPolicy opaqueResponse { OpaqueResponseBodyPolicy::Receive };
-        ResponseFilteringPolicy filteringPolicy { ResponseFilteringPolicy::Enable };
+        ResponseFilteringPolicy filteringPolicy { ResponseFilteringPolicy::Disable };
     };
 

trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp

@@ -93 +93 @@
 
 LoaderTaskOptions::LoaderTaskOptions(const ThreadableLoaderOptions& options, const String& referrer, Ref<SecurityOrigin>&& origin)
-    : options(options, options.preflightPolicy, options.contentSecurityPolicyEnforcement, options.initiator.isolatedCopy(), options.opaqueResponse, options.filteringPolicy)
+    : options(options, options.preflightPolicy, options.contentSecurityPolicyEnforcement, options.initiator.isolatedCopy(), options.filteringPolicy)
     , referrer(referrer.isolatedCopy())
     , origin(WTFMove(origin))

trunk/Source/WebCore/workers/WorkerScriptLoader.cpp

@@ -67 +67 @@
     options.sendLoadCallbacks = SendCallbacks;
     options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
-    options.filteringPolicy = ResponseFilteringPolicy::Disable;
 
     WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(*scriptExecutionContext), WTFMove(*request), *this, options);
@@ -93 +92 @@
     options.sendLoadCallbacks = SendCallbacks;
     options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
-    options.filteringPolicy = ResponseFilteringPolicy::Disable;
 
     // During create, callbacks may happen which remove the last reference to this object.

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -670 +670 @@
     options.initiator = cachedResourceRequestInitiators().xmlhttprequest;
     options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
+    options.filteringPolicy = ResponseFilteringPolicy::Enable;
 
     if (m_timeoutMilliseconds) {