diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
| commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
| tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/loader/ResourceLoadScheduler.h | |
| parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
| download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/loader/ResourceLoadScheduler.h')
| -rw-r--r-- | Source/WebCore/loader/ResourceLoadScheduler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/ResourceLoadScheduler.h b/Source/WebCore/loader/ResourceLoadScheduler.h index a32b307..a97d1d1 100644 --- a/Source/WebCore/loader/ResourceLoadScheduler.h +++ b/Source/WebCore/loader/ResourceLoadScheduler.h @@ -50,7 +50,7 @@ class ResourceLoadScheduler { public: 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*); void remove(ResourceLoader*); |