| Index: third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| index 543539ab28e868198e55475f035f3402fa4858bd..44bd045eefdab6b0f1d408a3b1a6e5c3d54e812d 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.h
|
| @@ -27,33 +27,35 @@
|
| ~WorkerInspectorProxy();
|
| DECLARE_TRACE();
|
|
|
| - class CORE_EXPORT PageInspector {
|
| + class PageInspector : public NoBaseWillBeGarbageCollectedFinalized<PageInspector> {
|
| public:
|
| virtual ~PageInspector() { }
|
| - virtual void dispatchMessageFromWorker(WorkerInspectorProxy*, const String&) = 0;
|
| - virtual void workerConsoleAgentEnabled(WorkerInspectorProxy*) = 0;
|
| + virtual void dispatchMessageFromWorker(const String&) = 0;
|
| + virtual void workerConsoleAgentEnabled(WorkerGlobalScopeProxy*) = 0;
|
| + DEFINE_INLINE_VIRTUAL_TRACE() { }
|
| };
|
|
|
| WorkerThreadStartMode workerStartMode(ExecutionContext*);
|
| void workerThreadCreated(ExecutionContext*, WorkerThread*, const KURL&);
|
| void workerThreadTerminated();
|
| - void dispatchMessageFromWorker(const String&);
|
| - void workerConsoleAgentEnabled();
|
|
|
| void connectToInspector(PageInspector*);
|
| - void disconnectFromInspector(PageInspector*);
|
| + void disconnectFromInspector();
|
| void sendMessageToInspector(const String&);
|
| void writeTimelineStartedEvent(const String& sessionId, const String& workerId);
|
|
|
| - const String& url() { return m_url; }
|
| + PageInspector* pageInspector() const { return m_pageInspector; }
|
| +
|
| + void setWorkerGlobalScopeProxy(WorkerGlobalScopeProxy* proxy) { m_workerGlobalScopeProxy = proxy; }
|
| + WorkerGlobalScopeProxy* workerGlobalScopeProxy() const { return m_workerGlobalScopeProxy; }
|
|
|
| private:
|
| WorkerInspectorProxy();
|
|
|
| WorkerThread* m_workerThread;
|
| RawPtrWillBeMember<ExecutionContext> m_executionContext;
|
| - PageInspector* m_pageInspector;
|
| - String m_url;
|
| + RawPtrWillBeMember<WorkerInspectorProxy::PageInspector> m_pageInspector;
|
| + WorkerGlobalScopeProxy* m_workerGlobalScopeProxy;
|
| };
|
|
|
| } // namespace blink
|
|
|