| Index: Source/core/workers/WorkerThread.h
|
| diff --git a/Source/core/workers/WorkerThread.h b/Source/core/workers/WorkerThread.h
|
| index f1d083b1e768abdcbf4f0daa9be2c5610adc4de9..dbf16695c67ef624584d133f45ee48c9eb6653dc 100644
|
| --- a/Source/core/workers/WorkerThread.h
|
| +++ b/Source/core/workers/WorkerThread.h
|
| @@ -42,6 +42,7 @@
|
| namespace blink {
|
|
|
| class KURL;
|
| +class WebTeleporter;
|
| class WebWaitableEvent;
|
| class WorkerGlobalScope;
|
| class WorkerInspectorController;
|
| @@ -97,6 +98,11 @@ public:
|
| void interruptAndDispatchInspectorCommands();
|
| void setWorkerInspectorController(WorkerInspectorController*);
|
|
|
| + void setTeleporter(WebTeleporter*);
|
| + WebTeleporter* teleporter() const { return m_teleporter; }
|
| +
|
| + int id() const { return m_compositorId; }
|
| +
|
| protected:
|
| WorkerThread(WorkerLoaderProxy&, WorkerReportingProxy&, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
|
|
|
| @@ -105,6 +111,8 @@ protected:
|
|
|
| virtual void postInitialize() { }
|
|
|
| + virtual blink::WebWorkerRunLoop getRunLoop();
|
| +
|
| private:
|
| friend class WorkerSharedTimer;
|
| friend class WorkerThreadShutdownFinishTask;
|
| @@ -117,6 +125,10 @@ private:
|
| void idleHandler();
|
| void postDelayedTask(PassOwnPtr<ExecutionContextTask>, long long delayMs);
|
|
|
| + virtual void initializeWebThread();
|
| + virtual blink::WebThreadSupportingGC* thread() const;
|
| +
|
| +
|
| bool m_terminated;
|
| OwnPtr<WorkerSharedTimer> m_sharedTimer;
|
| MessageQueue<WorkerThreadTask> m_debuggerMessageQueue;
|
| @@ -138,6 +150,10 @@ private:
|
| // Used to signal thread termination.
|
| OwnPtr<WebWaitableEvent> m_terminationEvent;
|
|
|
| + // FIXME: Confirm that there are no thread safety issues here.
|
| + WebTeleporter* m_teleporter;
|
| + int m_compositorId;
|
| +
|
| // FIXME: This has to be last because of crbug.com/401397 - the
|
| // WorkerThread might get deleted before it had a chance to properly
|
| // shut down. By deleting the WebThread first, we can guarantee that
|
|
|