Changeset 94003 in webkit

Timestamp:

Aug 29, 2011, 12:26:46 PM (15 years ago)

Author:

Nate Chapin

Message:

Plumb ResourceLoaderOptions out to CachedResourceLoader::requestResource().
This will be needed in order for DocumentThreadableLoader to become a CachedResourceClient.
​https://bugs.webkit.org/show_bug.cgi?id=66018

Reviewed by Antti Koivisto.

No new tests, refactor only.

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::load):

• loader/cache/CachedResource.cpp:

(WebCore::CachedResource::CachedResource):
(WebCore::CachedResource::load):

• loader/cache/CachedResource.h:

(WebCore::CachedResource::load):

(WebCore::CachedResource::setResourceLoaderOptions):
(WebCore::CachedResource::sendResourceLoadCallbacks):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::loadResource):

• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedResourceRequest.cpp:

(WebCore::CachedResourceRequest::load):

• loader/cache/CachedResourceRequest.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Nate Chapin  <japhet@chromium.org>
+
+        Plumb ResourceLoaderOptions out to CachedResourceLoader::requestResource().
+        This will be needed in order for DocumentThreadableLoader to become a CachedResourceClient.
+        https://bugs.webkit.org/show_bug.cgi?id=66018
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, refactor only.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::load):
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::CachedResource):
+        (WebCore::CachedResource::load):
+        * loader/cache/CachedResource.h:
+       (WebCore::CachedResource::load):
+        (WebCore::CachedResource::setResourceLoaderOptions):
+        (WebCore::CachedResource::sendResourceLoadCallbacks):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
+        (WebCore::CachedResourceLoader::requestResource):
+        (WebCore::CachedResourceLoader::loadResource):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/CachedResourceRequest.cpp:
+        (WebCore::CachedResourceRequest::load):
+        * loader/cache/CachedResourceRequest.h:
+
 2011-08-29  Chris Palmer  <palmer@google.com>
 

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

@@ -85 +85 @@
 {
     if (!cachedResourceLoader || cachedResourceLoader->autoLoadImages())
-        CachedResource::load(cachedResourceLoader, true, DoSecurityCheck, true);
+        CachedResource::load(cachedResourceLoader, true, DoSecurityCheck);
     else
         setLoading(false);

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

@@ -93 +93 @@
     , m_inLiveDecodedResourcesList(false)
     , m_requestedFromNetworkingLayer(false)
-    , m_sendResourceLoadCallbacks(true)
     , m_inCache(false)
     , m_loading(false)
     , m_type(type)
     , m_status(Pending)
+    , m_options(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials)
 #ifndef NDEBUG
     , m_deleted(false)
@@ -132 +132 @@
 }
 
-void CachedResource::load(CachedResourceLoader* cachedResourceLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks)
-{
-    m_sendResourceLoadCallbacks = sendResourceLoadCallbacks;
+void CachedResource::load(CachedResourceLoader* cachedResourceLoader, bool incremental, SecurityCheckPolicy securityCheck)
+{
     m_loading = true;
-    m_request = CachedResourceRequest::load(cachedResourceLoader, this, incremental, securityCheck, sendResourceLoadCallbacks);
+    m_request = CachedResourceRequest::load(cachedResourceLoader, this, incremental, securityCheck, m_options);
     if (m_request) {
         m_status = Pending;

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

@@ -28 +28 @@
 #include "PlatformString.h"
 #include "PurgePriority.h"
+#include "ResourceLoaderOptions.h"
 #include "ResourceLoadPriority.h"
 #include "ResourceRequest.h"
@@ -86 +87 @@
     virtual ~CachedResource();
     
-    virtual void load(CachedResourceLoader* cachedResourceLoader)  { load(cachedResourceLoader, false, DoSecurityCheck, true); }
-    void load(CachedResourceLoader*, bool incremental, SecurityCheckPolicy, bool sendResourceLoadCallbacks);
+    virtual void load(CachedResourceLoader* cachedResourceLoader)  { load(cachedResourceLoader, false, DoSecurityCheck); }
+    void load(CachedResourceLoader*, bool incremental, SecurityCheckPolicy);
 
     virtual void setEncoding(const String&) { }
@@ -194 +195 @@
     bool wasCanceled() const { return m_status == Canceled; }
     bool errorOccurred() const { return (m_status == LoadError || m_status == DecodeError); }
-
-    bool sendResourceLoadCallbacks() const { return m_sendResourceLoadCallbacks; }
+    
+    void setResourceLoaderOptions(const ResourceLoaderOptions& options) { m_options = options; }
+    bool sendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
     
     virtual void destroyDecodedData() { }
@@ -271 +273 @@
     bool m_inLiveDecodedResourcesList : 1;
     bool m_requestedFromNetworkingLayer : 1;
-    bool m_sendResourceLoadCallbacks : 1;
 
     bool m_inCache : 1;
@@ -278 +279 @@
     unsigned m_type : 3; // Type
     unsigned m_status : 3; // Status
+
+    ResourceLoaderOptions m_options;
 
 #ifndef NDEBUG

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

@@ -171 +171 @@
     if (!inCache)
         userSheet->setInCache(true);
-    
-    userSheet->load(this, /*incremental*/ false, SkipSecurityCheck, /*sendResourceLoadCallbacks*/ false);
+
+    userSheet->setResourceLoaderOptions(ResourceLoaderOptions(DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials));
+    userSheet->load(this, /*incremental*/ false, SkipSecurityCheck);
 
     if (!inCache)
@@ -312 +313 @@
 }
 
-CachedResource* CachedResourceLoader::requestResource(CachedResource::Type type, ResourceRequest& request, const String& charset, ResourceLoadPriority priority, bool forPreload)
+CachedResource* CachedResourceLoader::requestResource(CachedResource::Type type, ResourceRequest& request, const String& charset, ResourceLoadPriority priority, bool forPreload, const ResourceLoaderOptions& options)
 {
     KURL url = request.url();
@@ -343 +344 @@
     switch (determineRevalidationPolicy(type, request, forPreload, resource)) {
     case Load:
-        resource = loadResource(type, request, charset, priority);
+        resource = loadResource(type, request, charset, priority, options);
         break;
     case Reload:
         memoryCache()->remove(resource);
-        resource = loadResource(type, request, charset, priority);
+        resource = loadResource(type, request, charset, priority, options);
         break;
     case Revalidate:
@@ -394 +395 @@
 }
 
-CachedResource* CachedResourceLoader::loadResource(CachedResource::Type type, ResourceRequest& request, const String& charset, ResourceLoadPriority priority)
+CachedResource* CachedResourceLoader::loadResource(CachedResource::Type type, ResourceRequest& request, const String& charset, ResourceLoadPriority priority, const ResourceLoaderOptions& options)
 {
     ASSERT(!memoryCache()->resourceForURL(request.url()));
@@ -410 +411 @@
     
     resource->setLoadPriority(priority);
+    resource->setResourceLoaderOptions(options);
     resource->load(this);
     

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

@@ -108 +108 @@
     
 private:
-    CachedResource* requestResource(CachedResource::Type, ResourceRequest&, const String& charset, ResourceLoadPriority = ResourceLoadPriorityUnresolved, bool isPreload = false);
-    CachedResource* revalidateResource(CachedResource*, ResourceLoadPriority priority);
-    CachedResource* loadResource(CachedResource::Type, ResourceRequest&, const String& charset, ResourceLoadPriority);
-    void requestPreload(CachedResource::Type, ResourceRequest& url, const String& charset);
+    // FIXME: The default value for ResourceLoaderOptions will always be used currently.
+    // It is plumbed for http://bugs.webkit.org/show_bug.cgi?id=61225 .
+    CachedResource* requestResource(CachedResource::Type, ResourceRequest&, const String& charset, ResourceLoadPriority = ResourceLoadPriorityUnresolved, bool isPreload = false, const ResourceLoaderOptions& = ResourceLoaderOptions(SendCallbacks, SniffContent, BufferData, AllowStoredCredentials));
+    CachedResource* revalidateResource(CachedResource*, ResourceLoadPriority);
+    CachedResource* loadResource(CachedResource::Type, ResourceRequest&, const String& charset, ResourceLoadPriority, const ResourceLoaderOptions&);
+    void requestPreload(CachedResource::Type, ResourceRequest&, const String& charset);
 
     enum RevalidationPolicy { Use, Revalidate, Reload, Load };

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

@@ -88 +88 @@
 }
 
-PassOwnPtr<CachedResourceRequest> CachedResourceRequest::load(CachedResourceLoader* cachedResourceLoader, CachedResource* resource, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks)
+PassOwnPtr<CachedResourceRequest> CachedResourceRequest::load(CachedResourceLoader* cachedResourceLoader, CachedResource* resource, bool incremental, SecurityCheckPolicy securityCheck, const ResourceLoaderOptions& options)
 {
     OwnPtr<CachedResourceRequest> request = adoptPtr(new CachedResourceRequest(cachedResourceLoader, resource, incremental));
@@ -125 +125 @@
     resourceRequest.setPriority(priority);
 
-    RefPtr<SubresourceLoader> loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->document()->frame(), request.get(), resourceRequest, priority, securityCheck,
-                                                                                        ResourceLoaderOptions(sendResourceLoadCallbacks ? SendCallbacks : DoNotSendCallbacks, SniffContent, BufferData, AllowStoredCredentials));
+    RefPtr<SubresourceLoader> loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->document()->frame(), request.get(), resourceRequest, priority, securityCheck, options);
     if (!loader || loader->reachedTerminalState()) {
         // FIXME: What if resources in other frames were waiting for this revalidation?

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

@@ -24 +24 @@
 
 #include "FrameLoaderTypes.h"
+#include "ResourceHandle.h"
+#include "ResourceLoaderOptions.h"
 #include "SubresourceLoaderClient.h"
 #include <wtf/HashMap.h>
@@ -42 +44 @@
     class CachedResourceRequest : private SubresourceLoaderClient {
     public:
-        static PassOwnPtr<CachedResourceRequest> load(CachedResourceLoader*, CachedResource*, bool incremental, SecurityCheckPolicy, bool sendResourceLoadCallbacks);
+        static PassOwnPtr<CachedResourceRequest> load(CachedResourceLoader*, CachedResource*, bool incremental, SecurityCheckPolicy, const ResourceLoaderOptions&);
         ~CachedResourceRequest();