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

Side by Side Diff: Source/core/workers/WorkerInspectorProxy.cpp

Issue 922023003: Revert of Add task location information to WorkerThread (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | Source/core/workers/WorkerMessagingProxy.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "core/workers/WorkerInspectorProxy.h" 7 #include "core/workers/WorkerInspectorProxy.h"
8 8
9 #include "core/dom/CrossThreadTask.h" 9 #include "core/dom/CrossThreadTask.h"
10 #include "core/inspector/InspectorInstrumentation.h" 10 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 { 52 {
53 toWorkerGlobalScope(context)->workerInspectorController()->connectFrontend() ; 53 toWorkerGlobalScope(context)->workerInspectorController()->connectFrontend() ;
54 } 54 }
55 55
56 void WorkerInspectorProxy::connectToInspector(WorkerInspectorProxy::PageInspecto r* pageInspector) 56 void WorkerInspectorProxy::connectToInspector(WorkerInspectorProxy::PageInspecto r* pageInspector)
57 { 57 {
58 if (!m_workerThread) 58 if (!m_workerThread)
59 return; 59 return;
60 ASSERT(!m_pageInspector); 60 ASSERT(!m_pageInspector);
61 m_pageInspector = pageInspector; 61 m_pageInspector = pageInspector;
62 m_workerThread->postDebuggerTask(FROM_HERE, createCrossThreadTask(connectToW orkerGlobalScopeInspectorTask, true)); 62 m_workerThread->postDebuggerTask(createCrossThreadTask(connectToWorkerGlobal ScopeInspectorTask, true));
63 } 63 }
64 64
65 static void disconnectFromWorkerGlobalScopeInspectorTask(ExecutionContext* conte xt, bool) 65 static void disconnectFromWorkerGlobalScopeInspectorTask(ExecutionContext* conte xt, bool)
66 { 66 {
67 toWorkerGlobalScope(context)->workerInspectorController()->disconnectFronten d(); 67 toWorkerGlobalScope(context)->workerInspectorController()->disconnectFronten d();
68 } 68 }
69 69
70 void WorkerInspectorProxy::disconnectFromInspector() 70 void WorkerInspectorProxy::disconnectFromInspector()
71 { 71 {
72 m_pageInspector = nullptr; 72 m_pageInspector = nullptr;
73 if (!m_workerThread) 73 if (!m_workerThread)
74 return; 74 return;
75 m_workerThread->postDebuggerTask(FROM_HERE, createCrossThreadTask(disconnect FromWorkerGlobalScopeInspectorTask, true)); 75 m_workerThread->postDebuggerTask(createCrossThreadTask(disconnectFromWorkerG lobalScopeInspectorTask, true));
76 } 76 }
77 77
78 static void dispatchOnInspectorBackendTask(ExecutionContext* context, const Stri ng& message) 78 static void dispatchOnInspectorBackendTask(ExecutionContext* context, const Stri ng& message)
79 { 79 {
80 toWorkerGlobalScope(context)->workerInspectorController()->dispatchMessageFr omFrontend(message); 80 toWorkerGlobalScope(context)->workerInspectorController()->dispatchMessageFr omFrontend(message);
81 } 81 }
82 82
83 void WorkerInspectorProxy::sendMessageToInspector(const String& message) 83 void WorkerInspectorProxy::sendMessageToInspector(const String& message)
84 { 84 {
85 if (!m_workerThread) 85 if (!m_workerThread)
86 return; 86 return;
87 m_workerThread->postDebuggerTask(FROM_HERE, createCrossThreadTask(dispatchOn InspectorBackendTask, String(message))); 87 m_workerThread->postDebuggerTask(createCrossThreadTask(dispatchOnInspectorBa ckendTask, String(message)));
88 m_workerThread->interruptAndDispatchInspectorCommands(); 88 m_workerThread->interruptAndDispatchInspectorCommands();
89 } 89 }
90 90
91 void WorkerInspectorProxy::writeTimelineStartedEvent(const String& sessionId, in t workerId) 91 void WorkerInspectorProxy::writeTimelineStartedEvent(const String& sessionId, in t workerId)
92 { 92 {
93 if (!m_workerThread) 93 if (!m_workerThread)
94 return; 94 return;
95 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Tracin gSessionIdForWorker", "data", InspectorTracingSessionIdForWorkerEvent::data(sess ionId, workerId, m_workerThread)); 95 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Tracin gSessionIdForWorker", "data", InspectorTracingSessionIdForWorkerEvent::data(sess ionId, workerId, m_workerThread));
96 } 96 }
97 97
98 } // namespace blink 98 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | Source/core/workers/WorkerMessagingProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698