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

Unified Diff: Source/core/workers/WorkerMessagingProxy.h

Issue 477313002: DevTools: Extract WorkerInspectorProxy interface from WorkerGlobalScopeProxy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Comments addressed. Created 6 years, 4 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
« no previous file with comments | « Source/core/workers/WorkerInspectorProxy.h ('k') | Source/core/workers/WorkerMessagingProxy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/workers/WorkerMessagingProxy.h
diff --git a/Source/core/workers/WorkerMessagingProxy.h b/Source/core/workers/WorkerMessagingProxy.h
index ace23749daa2f0009f8d32025f5e4194df571da8..4aa0af2f74c31f0d14fa65276d0d19503f646f2e 100644
--- a/Source/core/workers/WorkerMessagingProxy.h
+++ b/Source/core/workers/WorkerMessagingProxy.h
@@ -29,6 +29,7 @@
#include "core/dom/ExecutionContext.h"
#include "core/workers/WorkerGlobalScopeProxy.h"
+#include "core/workers/WorkerInspectorProxy.h"
#include "core/workers/WorkerLoaderProxy.h"
#include "wtf/Forward.h"
#include "wtf/Noncopyable.h"
@@ -45,7 +46,7 @@ class ExecutionContext;
class Worker;
class WorkerClients;
-class WorkerMessagingProxy FINAL : public WorkerGlobalScopeProxy, public WorkerLoaderProxy {
+class WorkerMessagingProxy FINAL : public WorkerGlobalScopeProxy, public WorkerLoaderProxy, public WorkerInspectorProxy {
WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); WTF_MAKE_FAST_ALLOCATED;
public:
WorkerMessagingProxy(Worker*, PassOwnPtrWillBeRawPtr<WorkerClients>);
@@ -57,7 +58,10 @@ public:
virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) OVERRIDE;
virtual bool hasPendingActivity() const OVERRIDE;
virtual void workerObjectDestroyed() OVERRIDE;
- virtual void connectToInspector(WorkerGlobalScopeProxy::PageInspector*) OVERRIDE;
+
+ // Implementations of WorkerInspectorProxy.
+ // (Only use these methods on the worker object thread.)
+ virtual void connectToInspector(WorkerInspectorProxy::PageInspector*) OVERRIDE;
virtual void disconnectFromInspector() OVERRIDE;
virtual void sendMessageToInspector(const String&) OVERRIDE;
virtual void writeTimelineStartedEvent(const String& sessionId) OVERRIDE;
@@ -100,7 +104,7 @@ private:
bool m_askedToTerminate;
Vector<OwnPtr<ExecutionContextTask> > m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
- WorkerGlobalScopeProxy::PageInspector* m_pageInspector;
+ WorkerInspectorProxy::PageInspector* m_pageInspector;
OwnPtrWillBePersistent<WorkerClients> m_workerClients;
};
« no previous file with comments | « Source/core/workers/WorkerInspectorProxy.h ('k') | Source/core/workers/WorkerMessagingProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698