| Index: Source/core/loader/DocumentThreadableLoader.h
|
| diff --git a/Source/core/loader/DocumentThreadableLoader.h b/Source/core/loader/DocumentThreadableLoader.h
|
| index 70a3322cf9450eda13b0975a09d9024ff5010fd6..46299625af30433d7034d976bcc9dd17af5b219f 100644
|
| --- a/Source/core/loader/DocumentThreadableLoader.h
|
| +++ b/Source/core/loader/DocumentThreadableLoader.h
|
| @@ -54,8 +54,8 @@ class ThreadableLoaderClient;
|
| class DocumentThreadableLoader FINAL : public ThreadableLoader, private ResourceOwner<RawResource> {
|
| WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| - static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
|
| - static PassRefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&);
|
| + static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + static PassRefPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| virtual ~DocumentThreadableLoader();
|
|
|
| virtual void cancel() OVERRIDE;
|
| @@ -67,7 +67,7 @@ class DocumentThreadableLoader FINAL : public ThreadableLoader, private Resource
|
| LoadAsynchronously
|
| };
|
|
|
| - DocumentThreadableLoader(Document&, ThreadableLoaderClient*, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&);
|
| + DocumentThreadableLoader(Document&, ThreadableLoaderClient*, BlockingBehavior, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
|
|
| // RawResourceClient implementation
|
| virtual void dataSent(Resource*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
|
| @@ -104,7 +104,13 @@ class DocumentThreadableLoader FINAL : public ThreadableLoader, private Resource
|
|
|
| ThreadableLoaderClient* m_client;
|
| Document& m_document;
|
| - ThreadableLoaderOptions m_options;
|
| +
|
| + const ThreadableLoaderOptions m_options;
|
| + const ResourceLoaderOptions m_resourceLoaderOptions;
|
| +
|
| + StoredCredentials m_allowCredentials;
|
| + RefPtr<SecurityOrigin> m_securityOrigin;
|
| +
|
| bool m_sameOriginRequest;
|
| bool m_simpleRequest;
|
| bool m_async;
|
|
|