| Index: Source/core/loader/WorkerThreadableLoader.h
|
| diff --git a/Source/core/loader/WorkerThreadableLoader.h b/Source/core/loader/WorkerThreadableLoader.h
|
| index 7348832831118cabec47ae02c3db5afaeb5bd369..962b7752d5b76b5447c52f73b8fd98e56d7af2d1 100644
|
| --- a/Source/core/loader/WorkerThreadableLoader.h
|
| +++ b/Source/core/loader/WorkerThreadableLoader.h
|
| @@ -49,7 +49,7 @@ namespace blink {
|
| class WorkerLoaderProxy;
|
| struct CrossThreadResourceRequestData;
|
|
|
| - class WorkerThreadableLoader FINAL : public ThreadableLoader {
|
| + class WorkerThreadableLoader final : public ThreadableLoader {
|
| WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| static void loadResourceSynchronously(WorkerGlobalScope&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| @@ -60,9 +60,9 @@ namespace blink {
|
|
|
| virtual ~WorkerThreadableLoader();
|
|
|
| - virtual void overrideTimeout(unsigned long timeout) OVERRIDE;
|
| + virtual void overrideTimeout(unsigned long timeout) override;
|
|
|
| - virtual void cancel() OVERRIDE;
|
| + virtual void cancel() override;
|
|
|
| private:
|
| // Creates a loader on the main thread and bridges communication between
|
| @@ -84,7 +84,7 @@ namespace blink {
|
| // thread do "ThreadableLoaderClientWrapper::ref" (automatically inside of the cross thread copy
|
| // done in createCrossThreadTask), so the ThreadableLoaderClientWrapper instance is there until all
|
| // tasks are executed.
|
| - class MainThreadBridge FINAL : public ThreadableLoaderClient {
|
| + class MainThreadBridge final : public ThreadableLoaderClient {
|
| public:
|
| // All executed on the worker context's thread.
|
| MainThreadBridge(PassRefPtr<ThreadableLoaderClientWrapper>, PassOwnPtr<ThreadableLoaderClient>, WorkerLoaderProxy&, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, const String& outgoingReferrer);
|
| @@ -103,15 +103,15 @@ namespace blink {
|
| static void mainThreadCreateLoader(ExecutionContext*, MainThreadBridge*, PassOwnPtr<CrossThreadResourceRequestData>, ThreadableLoaderOptions, ResourceLoaderOptions, const String& outgoingReferrer);
|
| static void mainThreadOverrideTimeout(ExecutionContext*, MainThreadBridge*, unsigned long timeoutMilliseconds);
|
| static void mainThreadCancel(ExecutionContext*, MainThreadBridge*);
|
| - virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
|
| - virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) OVERRIDE;
|
| - virtual void didReceiveData(const char*, unsigned dataLength) OVERRIDE;
|
| - virtual void didDownloadData(int dataLength) OVERRIDE;
|
| - virtual void didReceiveCachedMetadata(const char*, int dataLength) OVERRIDE;
|
| - virtual void didFinishLoading(unsigned long identifier, double finishTime) OVERRIDE;
|
| - virtual void didFail(const ResourceError&) OVERRIDE;
|
| - virtual void didFailAccessControlCheck(const ResourceError&) OVERRIDE;
|
| - virtual void didFailRedirectCheck() OVERRIDE;
|
| + virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
|
| + virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) override;
|
| + virtual void didReceiveData(const char*, unsigned dataLength) override;
|
| + virtual void didDownloadData(int dataLength) override;
|
| + virtual void didReceiveCachedMetadata(const char*, int dataLength) override;
|
| + virtual void didFinishLoading(unsigned long identifier, double finishTime) override;
|
| + virtual void didFail(const ResourceError&) override;
|
| + virtual void didFailAccessControlCheck(const ResourceError&) override;
|
| + virtual void didFailRedirectCheck() override;
|
|
|
| // Only to be used on the main thread.
|
| RefPtr<ThreadableLoader> m_mainThreadLoader;
|
|
|