| Index: Source/core/workers/WorkerThread.h
|
| diff --git a/Source/core/workers/WorkerThread.h b/Source/core/workers/WorkerThread.h
|
| index 98c75ec8019c0c08645fdbc0678b4e2aa993388f..58fb861d98e0b3e132437e5b3af7fcaef664ea03 100644
|
| --- a/Source/core/workers/WorkerThread.h
|
| +++ b/Source/core/workers/WorkerThread.h
|
| @@ -31,8 +31,10 @@
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| #include "core/workers/WorkerGlobalScope.h"
|
| #include "platform/SharedTimer.h"
|
| -#include "platform/WebThreadSupportingGC.h"
|
| +#include "platform/heap/glue/MessageLoopInterruptor.h"
|
| +#include "platform/heap/glue/PendingGCRunner.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| +#include "public/platform/WebThread.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/MessageQueue.h"
|
| #include "wtf/OwnPtr.h"
|
| @@ -97,6 +99,9 @@ namespace blink {
|
|
|
| void interruptAndDispatchInspectorCommands();
|
| void setWorkerInspectorController(WorkerInspectorController*);
|
| + void postTaskLanguageChanged();
|
| + // static void notifyAcceptLanguagesChanged(const String& newLanguagesList);
|
| + static void notifyAcceptLanguagesChanged(const Vector<String>& newLanguagesList);
|
|
|
| protected:
|
| WorkerThread(WorkerLoaderProxy&, WorkerReportingProxy&, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
|
| @@ -121,7 +126,9 @@ namespace blink {
|
| bool m_terminated;
|
| OwnPtr<WorkerSharedTimer> m_sharedTimer;
|
| MessageQueue<WorkerThreadTask> m_debuggerMessageQueue;
|
| + OwnPtr<PendingGCRunner> m_pendingGCRunner;
|
| OwnPtr<WebThread::TaskObserver> m_microtaskRunner;
|
| + OwnPtr<MessageLoopInterruptor> m_messageLoopInterruptor;
|
|
|
| WorkerLoaderProxy& m_workerLoaderProxy;
|
| WorkerReportingProxy& m_workerReportingProxy;
|
| @@ -144,7 +151,7 @@ namespace blink {
|
| // shut down. By deleting the WebThread first, we can guarantee that
|
| // no pending tasks on the thread might want to access any of the other
|
| // members during the WorkerThread's destruction.
|
| - OwnPtr<WebThreadSupportingGC> m_thread;
|
| + OwnPtr<blink::WebThread> m_thread;
|
| };
|
|
|
| } // namespace blink
|
|
|