| Index: Source/core/loader/ThreadableLoader.h
|
| diff --git a/Source/core/loader/ThreadableLoader.h b/Source/core/loader/ThreadableLoader.h
|
| index f562551f623e1363ec8e76599091826bc9b8553d..d3375043ae81baae0cb8e3cf05b80c2f1b10f43a 100644
|
| --- a/Source/core/loader/ThreadableLoader.h
|
| +++ b/Source/core/loader/ThreadableLoader.h
|
| @@ -62,7 +62,7 @@ namespace WebCore {
|
| DoNotEnforceContentSecurityPolicy,
|
| };
|
|
|
| - struct ThreadableLoaderOptions : public ResourceLoaderOptions {
|
| + struct ThreadableLoaderOptions {
|
| ThreadableLoaderOptions()
|
| : preflightPolicy(ConsiderPreflight)
|
| , crossOriginRequestPolicy(DenyCrossOriginRequests)
|
| @@ -81,8 +81,14 @@ namespace WebCore {
|
| class ThreadableLoader : public RefCounted<ThreadableLoader> {
|
| WTF_MAKE_NONCOPYABLE(ThreadableLoader);
|
| public:
|
| - static void loadResourceSynchronously(ExecutionContext&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&);
|
| - static PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&);
|
| + // ThreadableLoaderOptions argument configures this ThreadableLoader's
|
| + // behavior.
|
| + //
|
| + // ResourceLoaderOptions argument will be passed to the FetchRequest
|
| + // that this ThreadableLoader creates. It can be altered e.g. when
|
| + // redirect happens.
|
| + static void loadResourceSynchronously(ExecutionContext&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + static PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
|
|
| virtual void cancel() = 0;
|
|
|
|
|