| Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
|
| diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
|
| index b72fe9c4aea137c587690af5a6f5b14665c605ae..9e349071198bea14273638c2058f1e6acfd0e0b5 100644
|
| --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
|
| +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
|
| @@ -12,6 +12,7 @@
|
|
|
| class InProcessWorkerObjectProxy;
|
|
|
| +// This class is overridden in unit-tests.
|
| class MODULES_EXPORT CompositorWorkerThread final : public WorkerThread {
|
| public:
|
| static PassOwnPtr<CompositorWorkerThread> create(PassRefPtr<WorkerLoaderProxy>, InProcessWorkerObjectProxy&, double timeOrigin);
|
| @@ -24,13 +25,15 @@
|
| static void ensureSharedBackingThread();
|
| static void createSharedBackingThreadForTest();
|
|
|
| + // This is called before CoreInitializer::shutdown as shutdown waits for
|
| + // worker threads that can be blocked by scripts.
|
| + static void terminateExecution();
|
| static void clearSharedBackingThread();
|
|
|
| protected:
|
| CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy>, InProcessWorkerObjectProxy&, double timeOrigin);
|
|
|
| WorkerGlobalScope* createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData>) override;
|
| - bool isOwningBackingThread() const override { return false; }
|
|
|
| private:
|
| InProcessWorkerObjectProxy& m_workerObjectProxy;
|
|
|