Changeset 86290 in webkit

Timestamp:

May 11, 2011 5:28:14 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-11 Antoine Labour <​piman@chromium.org>

Reviewed by David Levin.

Expose shouldBufferData to ThreadableLoaderOptions to be able to disable buffering of the
loaded resource.
​https://bugs.webkit.org/show_bug.cgi?id=60656

• loader/DocumentThreadableLoader.cpp: (WebCore::DocumentThreadableLoader::loadRequest): Pass the shouldBufferData to the resource load scheduler, forcing it to true for the preflight request.
• loader/ResourceLoadScheduler.cpp: (WebCore::ResourceLoadScheduler::scheduleSubresourceLoad): Pass through shouldBufferData to SubresourceLoader::create
• loader/ResourceLoadScheduler.h:

• loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::create): Set shouldBufferData on the newly created loader

• loader/SubresourceLoader.h:

• loader/ThreadableLoader.h: (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Add shouldBufferData to the options, defaulting to true.

2011-05-11 Antoine Labour <​piman@chromium.org>

Reviewed by David Levin.

Don't buffer data for resources loaded by AssociatedURLLoader.
​https://bugs.webkit.org/show_bug.cgi?id=60656

• src/AssociatedURLLoader.cpp: (WebKit::AssociatedURLLoader::loadAsynchronously): set shouldBufferData to false in ThreadableLoaderOptions

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/DocumentThreadableLoader.cpp (modified) (1 diff)
• WebCore/loader/ResourceLoadScheduler.cpp (modified) (1 diff)
• WebCore/loader/ResourceLoadScheduler.h (modified) (1 diff)
• WebCore/loader/SubresourceLoader.cpp (modified) (2 diffs)
• WebCore/loader/SubresourceLoader.h (modified) (1 diff)
• WebCore/loader/ThreadableLoader.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/AssociatedURLLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Antoine Labour  <piman@chromium.org>
+
+        Reviewed by David Levin.
+
+        Expose shouldBufferData to ThreadableLoaderOptions to be able to disable buffering of the
+        loaded resource.
+        https://bugs.webkit.org/show_bug.cgi?id=60656
+
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::loadRequest):
+        Pass the shouldBufferData to the resource load scheduler, forcing it to true for the
+        preflight request.
+        * loader/ResourceLoadScheduler.cpp:
+        (WebCore::ResourceLoadScheduler::scheduleSubresourceLoad):
+        Pass through shouldBufferData to SubresourceLoader::create
+        * loader/ResourceLoadScheduler.h:
+
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::create):
+        Set shouldBufferData on the newly created loader
+
+        * loader/SubresourceLoader.h:
+
+        * loader/ThreadableLoader.h:
+        (WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions):
+        Add shouldBufferData to the options, defaulting to true.
+
 2011-05-11  Jay Civelli  <jcivelli@chromium.org>
 

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -347 +347 @@
         bool sendLoadCallbacks = m_options.sendLoadCallbacks && !m_actualRequest;
         bool sniffContent = m_options.sniffContent && !m_actualRequest;
+        // Keep buffering the data for the preflight request.
+        bool shouldBufferData = m_options.shouldBufferData || m_actualRequest;
 
         // Clear the loader so that any callbacks from SubresourceLoader::create will not have the old loader.
         m_loader = 0;
         m_loader = resourceLoadScheduler()->scheduleSubresourceLoad(m_document->frame(), this, request, ResourceLoadPriorityMedium, securityCheck, sendLoadCallbacks,
-                                                                    sniffContent, m_optionalOutgoingReferrer);
+                                                                    sniffContent, m_optionalOutgoingReferrer, shouldBufferData);
         return;
     }

trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp

@@ -85 +85 @@
 
 PassRefPtr<SubresourceLoader> ResourceLoadScheduler::scheduleSubresourceLoad(Frame* frame, SubresourceLoaderClient* client, const ResourceRequest& request, ResourceLoadPriority priority, SecurityCheckPolicy securityCheck,
-                                                                             bool sendResourceLoadCallbacks, bool shouldContentSniff, const String& optionalOutgoingReferrer)
-{
-    RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, client, request, securityCheck, sendResourceLoadCallbacks, shouldContentSniff, optionalOutgoingReferrer);
+                                                                             bool sendResourceLoadCallbacks, bool shouldContentSniff, const String& optionalOutgoingReferrer, bool shouldBufferData)
+{
+    RefPtr<SubresourceLoader> loader = SubresourceLoader::create(frame, client, request, securityCheck, sendResourceLoadCallbacks, shouldContentSniff, optionalOutgoingReferrer, shouldBufferData);
     if (loader)
         scheduleLoad(loader.get(), priority);

trunk/Source/WebCore/loader/ResourceLoadScheduler.h

@@ -51 +51 @@
     friend ResourceLoadScheduler* resourceLoadScheduler();
 
-    PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, SubresourceLoaderClient*, const ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityLow, SecurityCheckPolicy = DoSecurityCheck, bool sendResourceLoadCallbacks = true, bool shouldContentSniff = true, const String& optionalOutgoingReferrer = String());
+    PassRefPtr<SubresourceLoader> scheduleSubresourceLoad(Frame*, SubresourceLoaderClient*, const ResourceRequest&, ResourceLoadPriority = ResourceLoadPriorityLow, SecurityCheckPolicy = DoSecurityCheck, bool sendResourceLoadCallbacks = true, bool shouldContentSniff = true, const String& optionalOutgoingReferrer = String(), bool shouldBufferData = true);
     PassRefPtr<NetscapePlugInStreamLoader> schedulePluginStreamLoad(Frame*, NetscapePlugInStreamLoaderClient*, const ResourceRequest&);
     void addMainResourceLoad(ResourceLoader*);

trunk/Source/WebCore/loader/SubresourceLoader.cpp

@@ -62 +62 @@
 }
 
-PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, SubresourceLoaderClient* client, const ResourceRequest& request, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks, bool shouldContentSniff, const String& optionalOutgoingReferrer)
+PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, SubresourceLoaderClient* client, const ResourceRequest& request, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks, bool shouldContentSniff, const String& optionalOutgoingReferrer, bool shouldBufferData)
 {
     if (!frame)
@@ -101 +101 @@
 
     RefPtr<SubresourceLoader> subloader(adoptRef(new SubresourceLoader(frame, client, sendResourceLoadCallbacks, shouldContentSniff)));
+    subloader->setShouldBufferData(shouldBufferData);
     subloader->documentLoader()->addSubresourceLoader(subloader.get());
     if (!subloader->init(newRequest))

trunk/Source/WebCore/loader/SubresourceLoader.h

@@ -42 +42 @@
     class SubresourceLoader : public ResourceLoader {
     public:
-        static PassRefPtr<SubresourceLoader> create(Frame*, SubresourceLoaderClient*, const ResourceRequest&, SecurityCheckPolicy = DoSecurityCheck, bool sendResourceLoadCallbacks = true, bool shouldContentSniff = true, const String& optionalOutgoingReferrer = String());
+        static PassRefPtr<SubresourceLoader> create(Frame*, SubresourceLoaderClient*, const ResourceRequest&, SecurityCheckPolicy = DoSecurityCheck, bool sendResourceLoadCallbacks = true, bool shouldContentSniff = true, const String& optionalOutgoingReferrer = String(), bool shouldBufferData = true);
 
         void clearClient() { m_client = 0; }

trunk/Source/WebCore/loader/ThreadableLoader.h

@@ -56 +56 @@
     
     struct ThreadableLoaderOptions {
-        ThreadableLoaderOptions() : sendLoadCallbacks(false), sniffContent(false), allowCredentials(false), forcePreflight(false), crossOriginRequestPolicy(DenyCrossOriginRequests) { }
+        ThreadableLoaderOptions() : sendLoadCallbacks(false), sniffContent(false), allowCredentials(false), forcePreflight(false), crossOriginRequestPolicy(DenyCrossOriginRequests), shouldBufferData(true) { }
         bool sendLoadCallbacks;
         bool sniffContent;
@@ -62 +62 @@
         bool forcePreflight;  // If AccessControl is used, whether to force a preflight.
         CrossOriginRequestPolicy crossOriginRequestPolicy;
+        bool shouldBufferData;
     };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-11  Antoine Labour  <piman@chromium.org>
+
+        Reviewed by David Levin.
+
+        Don't buffer data for resources loaded by AssociatedURLLoader.
+        https://bugs.webkit.org/show_bug.cgi?id=60656
+
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::loadAsynchronously): set shouldBufferData to false in ThreadableLoaderOptions
+
 2011-05-11  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

@@ -211 +211 @@
     options.forcePreflight = m_options.forcePreflight;
     options.crossOriginRequestPolicy = static_cast<WebCore::CrossOriginRequestPolicy>(m_options.crossOriginRequestPolicy);
+    options.shouldBufferData = false;
 
     const ResourceRequest& webcoreRequest = request.toResourceRequest();