Changeset 93923 in webkit

Timestamp:

Aug 26, 2011 4:31:55 PM (13 years ago)

Author:

Nate Chapin

Message:

Move allowCredentials from ThreadableLoaderOptions down
to ResourceLoaderOptions. This allows us to remove
getShouldUseCredentialStorage() from SubresourceLoaderClient
and check allowCredentials in ResourceLoader.
​https://bugs.webkit.org/show_bug.cgi?id=65330

Reviewed by Alexey Proskuryakov.

No new tests, refractor only.

• loader/DocumentThreadableLoader.cpp:
• loader/DocumentThreadableLoader.h:
• loader/MainResourceLoader.cpp:
• loader/NetscapePlugInStreamLoader.cpp:
• loader/ResourceLoadScheduler.h:
• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::shouldUseCredentialStorage): Check

m_options.allowCredentials instead of calling a client.

• loader/ResourceLoaderOptions.h:
• loader/SubresourceLoader.cpp:
• loader/SubresourceLoader.h:
• loader/SubresourceLoaderClient.h:
• loader/ThreadableLoader.h:
• loader/cache/CachedResourceRequest.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentThreadableLoader.cpp (modified) (1 diff)
• loader/DocumentThreadableLoader.h (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (1 diff)
• loader/NetscapePlugInStreamLoader.cpp (modified) (1 diff)
• loader/ResourceLoadScheduler.h (modified) (1 diff)
• loader/ResourceLoader.cpp (modified) (1 diff)
• loader/ResourceLoaderOptions.h (modified) (2 diffs)
• loader/SubresourceLoader.cpp (modified) (1 diff)
• loader/SubresourceLoader.h (modified) (1 diff)
• loader/SubresourceLoaderClient.h (modified) (1 diff)
• loader/ThreadableLoader.h (modified) (1 diff)
• loader/cache/CachedResourceRequest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-26  Nate Chapin  <japhet@chromium.org>
+
+        Move allowCredentials from ThreadableLoaderOptions down
+        to ResourceLoaderOptions. This allows us to remove
+        getShouldUseCredentialStorage() from SubresourceLoaderClient
+        and check allowCredentials in ResourceLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=65330
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, refractor only.
+
+        * loader/DocumentThreadableLoader.cpp:
+        * loader/DocumentThreadableLoader.h:
+        * loader/MainResourceLoader.cpp:
+        * loader/NetscapePlugInStreamLoader.cpp:
+        * loader/ResourceLoadScheduler.h:
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::shouldUseCredentialStorage): Check
+            m_options.allowCredentials instead of calling a client.
+        * loader/ResourceLoaderOptions.h:
+        * loader/SubresourceLoader.cpp:
+        * loader/SubresourceLoader.h:
+        * loader/SubresourceLoaderClient.h:
+        * loader/ThreadableLoader.h:
+        * loader/cache/CachedResourceRequest.cpp:
+
 2011-08-26  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -289 +289 @@
 }
 
-bool DocumentThreadableLoader::getShouldUseCredentialStorage(SubresourceLoader* loader, bool& shouldUseCredentialStorage)
-{
-    ASSERT_UNUSED(loader, loader == m_loader || !m_loader);
-
-    if (m_options.allowCredentials == DoNotAllowStoredCredentials) {
-        shouldUseCredentialStorage = false;
-        return true;
-    }
-
-    return false; // Only FrameLoaderClient can ultimately permit credential use.
-}
-
 void DocumentThreadableLoader::didReceiveAuthenticationChallenge(SubresourceLoader* loader, const AuthenticationChallenge& challenge)
 {

trunk/Source/WebCore/loader/DocumentThreadableLoader.h

@@ -83 +83 @@
         virtual void didFail(SubresourceLoader*, const ResourceError&);
 
-        virtual bool getShouldUseCredentialStorage(SubresourceLoader*, bool& shouldUseCredentialStorage);
         virtual void didReceiveAuthenticationChallenge(SubresourceLoader*, const AuthenticationChallenge&);
 

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -61 +61 @@
 
 MainResourceLoader::MainResourceLoader(Frame* frame)
-    : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData))
+    : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials))
     , m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
     , m_loadingMultipartContent(false)

trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp

@@ -37 +37 @@
 
 NetscapePlugInStreamLoader::NetscapePlugInStreamLoader(Frame* frame, NetscapePlugInStreamLoaderClient* client)
-    : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData))
+    : ResourceLoader(frame, ResourceLoaderOptions(SendCallbacks, SniffContent, DoNotBufferData, AllowStoredCredentials))
     , m_client(client)
 {

trunk/Source/WebCore/loader/ResourceLoadScheduler.h

@@ -52 +52 @@
     friend ResourceLoadScheduler* resourceLoadScheduler();
 
-    PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, SubresourceLoaderClient*, const ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityLow, SecurityCheckPolicy = DoSecurityCheck, const ResourceLoaderOptions& = ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData));
+    PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, SubresourceLoaderClient*, const ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityLow, SecurityCheckPolicy = DoSecurityCheck, const ResourceLoaderOptions& = ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials));
     PassRefPtr<NetscapePlugInStreamLoader> schedulePluginStreamLoad(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
     void addMainResourceLoad(ResourceLoader*);

trunk/Source/WebCore/loader/ResourceLoader.cpp

@@ -518 +518 @@
     if (!fastMallocSize(documentLoader()->frame()))
         CRASH();
+
+    if (m_options.allowCredentials == DoNotAllowStoredCredentials)
+        return false;
+    
     RefPtr<ResourceLoader> protector(this);
     return frameLoader()->client()->shouldUseCredentialStorage(documentLoader(), identifier());

trunk/Source/WebCore/loader/ResourceLoaderOptions.h

@@ -32 +32 @@
 #define ResourceLoaderOptions_h
 
+#include "ResourceHandle.h"
+
 namespace WebCore {
     
@@ -50 +52 @@
 
 struct ResourceLoaderOptions {
-    ResourceLoaderOptions() : sendLoadCallbacks(DoNotSendCallbacks), sniffContent(DoNotSniffContent), shouldBufferData(BufferData) { }
-    ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacksArg, ContentSniffingPolicy sniffContentArg, DataBufferingPolicy shouldBufferDataArg) : sendLoadCallbacks(sendLoadCallbacksArg), sniffContent(sniffContentArg), shouldBufferData(shouldBufferDataArg) { }
+    ResourceLoaderOptions() : sendLoadCallbacks(DoNotSendCallbacks), sniffContent(DoNotSniffContent), shouldBufferData(BufferData), allowCredentials(DoNotAllowStoredCredentials) { }
+    ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacksArg, ContentSniffingPolicy sniffContentArg, DataBufferingPolicy shouldBufferDataArg, StoredCredentials allowCredentialsArg) : sendLoadCallbacks(sendLoadCallbacksArg), sniffContent(sniffContentArg), shouldBufferData(shouldBufferDataArg), allowCredentials(allowCredentialsArg) { }
     SendCallbackPolicy sendLoadCallbacks;
     ContentSniffingPolicy sniffContent;
     DataBufferingPolicy shouldBufferData;
+    StoredCredentials allowCredentials; // Whether HTTP credentials and cookies are sent with the request.
 };
 

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -235 +235 @@
 }
 
-bool SubresourceLoader::shouldUseCredentialStorage()
-{
-    RefPtr<SubresourceLoader> protect(this);
-
-    bool shouldUse;
-    if (m_client && m_client->getShouldUseCredentialStorage(this, shouldUse))
-        return shouldUse;
-
-    return ResourceLoader::shouldUseCredentialStorage();
-}
-
 void SubresourceLoader::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
 {

trunk/Source/WebCore/loader/SubresourceLoader.h

@@ -57 +57 @@
         virtual void didFinishLoading(double finishTime);
         virtual void didFail(const ResourceError&);
-        virtual bool shouldUseCredentialStorage();
         virtual void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
         virtual void willCancel(const ResourceError&);

trunk/Source/WebCore/loader/SubresourceLoaderClient.h

@@ -52 +52 @@
     virtual void didFail(SubresourceLoader*, const ResourceError&) { }
     
-    virtual bool getShouldUseCredentialStorage(SubresourceLoader*, bool& /*shouldUseCredentialStorage*/) { return false; }
     virtual void didReceiveAuthenticationChallenge(SubresourceLoader*, const AuthenticationChallenge&) { }
 };

trunk/Source/WebCore/loader/ThreadableLoader.h

@@ -61 +61 @@
 
     struct ThreadableLoaderOptions : public ResourceLoaderOptions {
-        ThreadableLoaderOptions() : allowCredentials(DoNotAllowStoredCredentials), preflightPolicy(ConsiderPreflight), crossOriginRequestPolicy(DenyCrossOriginRequests) { }
-        StoredCredentials allowCredentials; // Whether HTTP credentials and cookies are sent with the request.
+        ThreadableLoaderOptions() : preflightPolicy(ConsiderPreflight), crossOriginRequestPolicy(DenyCrossOriginRequests) { }
         PreflightPolicy preflightPolicy; // If AccessControl is used, how to determine if a preflight is needed.
         CrossOriginRequestPolicy crossOriginRequestPolicy;

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

@@ -126 +126 @@
 
     RefPtr<SubresourceLoader> loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->document()->frame(), request.get(), resourceRequest, priority, securityCheck,
-                                                                                        ResourceLoaderOptions(sendResourceLoadCallbacks ? SendCallbacks : DoNotSendCallbacks, SniffContent, BufferData));
+                                                                                        ResourceLoaderOptions(sendResourceLoadCallbacks ? SendCallbacks : DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials));
     if (!loader || loader->reachedTerminalState()) {
         // FIXME: What if resources in other frames were waiting for this revalidation?