Index: third_party/WebKit/Source/core/workers/WorkerThread.h |
diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.h b/third_party/WebKit/Source/core/workers/WorkerThread.h |
index 696696c0197567a046aacb0667ca3414ed9d1724..a8b118f2374ef4ac46345fc811373a67fc18a16b 100644 |
--- a/third_party/WebKit/Source/core/workers/WorkerThread.h |
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.h |
@@ -45,7 +45,6 @@ class WaitableEvent; |
class WorkerBackingThread; |
class WorkerGlobalScope; |
class WorkerInspectorController; |
-class WorkerMicrotaskRunner; |
class WorkerReportingProxy; |
class WorkerThreadStartupData; |
@@ -75,9 +74,6 @@ public: |
void terminateAndWait(); |
static void terminateAndWaitForAllWorkers(); |
- // Called on the worker thread. Disposes |m_workerGlobalScope|. |
- void prepareForShutdown(); |
- |
virtual WorkerBackingThread& workerBackingThread() = 0; |
virtual bool shouldAttachThreadDebugger() const { return true; } |
v8::Isolate* isolate(); |
@@ -128,12 +124,15 @@ protected: |
virtual void postInitialize() { } |
private: |
+ class WorkerMicrotaskRunner; |
+ |
std::unique_ptr<CrossThreadClosure> createWorkerThreadTask(std::unique_ptr<ExecutionContextTask>, bool isInstrumented); |
// Called on the worker thread. |
void initialize(PassOwnPtr<WorkerThreadStartupData>); |
void performTask(std::unique_ptr<ExecutionContextTask>, bool isInstrumented); |
- void performShutdownTask(); |
+ void prepareForShutdown(); |
+ void performShutdown(); |
void runDebuggerTask(std::unique_ptr<CrossThreadClosure>); |
void runDebuggerTaskDontWait(); |
@@ -145,7 +144,7 @@ private: |
bool m_shouldTerminateV8Execution = false; |
OwnPtr<InspectorTaskRunner> m_inspectorTaskRunner; |
- OwnPtr<WebThread::TaskObserver> m_microtaskRunner; |
+ OwnPtr<WorkerMicrotaskRunner> m_microtaskRunner; |
RefPtr<WorkerLoaderProxy> m_workerLoaderProxy; |
WorkerReportingProxy& m_workerReportingProxy; |