Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: third_party/WebKit/Source/core/workers/WorkerThread.h

Issue 2539443004: Worker: Move ParentFrameTaskRunners from WorkerReportingProxy to ObjectProxy (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ac302a8792ffe3b862dd53bb983d17bb150eb4db..e7a8629e66aee570fea13ab1012268faffeafb6f 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThread.h
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.h
@@ -29,6 +29,7 @@
#include "core/CoreExport.h"
#include "core/frame/csp/ContentSecurityPolicy.h"
+#include "core/workers/ParentFrameTaskRunners.h"
#include "core/workers/WorkerLoaderProxy.h"
#include "core/workers/WorkerThreadLifecycleObserver.h"
#include "platform/LifecycleNotifier.h"
@@ -169,8 +170,14 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
void waitForShutdownForTesting() { m_shutdownEvent->wait(); }
+ ParentFrameTaskRunners* getParentFrameTaskRunners() const {
+ return m_parentFrameTaskRunners.get();
+ }
+
protected:
- WorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
+ WorkerThread(PassRefPtr<WorkerLoaderProxy>,
+ WorkerReportingProxy&,
+ ParentFrameTaskRunners*);
// Factory method for creating a new worker context for the thread.
// Called on the worker thread.
@@ -285,6 +292,7 @@ class CORE_EXPORT WorkerThread : public WebThread::TaskObserver {
RefPtr<WorkerLoaderProxy> m_workerLoaderProxy;
WorkerReportingProxy& m_workerReportingProxy;
+ CrossThreadPersistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
// This lock protects |m_globalScope|, |m_requestedToTerminate|,
// |m_threadState|, |m_runningDebuggerTask| and |m_exitCode|.
« no previous file with comments | « third_party/WebKit/Source/core/workers/WorkerReportingProxy.h ('k') | third_party/WebKit/Source/core/workers/WorkerThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698