OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 Google Inc. All rights reserved. | 2 * Copyright (c) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "bindings/core/v8/WorkerScriptDebugServer.h" | 32 #include "bindings/core/v8/WorkerScriptDebugServer.h" |
33 | 33 |
34 #include "bindings/core/v8/V8ScriptRunner.h" | 34 #include "bindings/core/v8/V8ScriptRunner.h" |
| 35 #include "core/inspector/InspectorInstrumentation.h" |
35 #include "core/inspector/ScriptDebugListener.h" | 36 #include "core/inspector/ScriptDebugListener.h" |
36 #include "core/inspector/WorkerDebuggerAgent.h" | 37 #include "core/inspector/WorkerDebuggerAgent.h" |
37 #include "core/workers/WorkerGlobalScope.h" | 38 #include "core/workers/WorkerGlobalScope.h" |
38 #include "core/workers/WorkerThread.h" | 39 #include "core/workers/WorkerThread.h" |
39 #include "wtf/MessageQueue.h" | 40 #include "wtf/MessageQueue.h" |
40 #include <v8.h> | 41 #include <v8.h> |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 | 44 |
44 static const char* workerContextDebugId = "[worker]"; | 45 static const char* workerContextDebugId = "[worker]"; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 | 84 |
84 ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Loc
al<v8::Context>) | 85 ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Loc
al<v8::Context>) |
85 { | 86 { |
86 // There is only one worker context in isolate. | 87 // There is only one worker context in isolate. |
87 return m_listener; | 88 return m_listener; |
88 } | 89 } |
89 | 90 |
90 void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Local<v8::Context>) | 91 void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Local<v8::Context>) |
91 { | 92 { |
92 MessageQueueWaitResult result; | 93 MessageQueueWaitResult result; |
93 m_workerGlobalScope->thread()->willEnterNestedLoop(); | 94 InspectorInstrumentation::willEnterNestedRunLoop(m_workerGlobalScope.get()); |
94 do { | 95 do { |
95 result = m_workerGlobalScope->thread()->runDebuggerTask(); | 96 result = m_workerGlobalScope->thread()->runDebuggerTask(); |
96 // Keep waiting until execution is resumed. | 97 // Keep waiting until execution is resumed. |
97 } while (result == MessageQueueMessageReceived && scriptDebugServer()->isPau
sed()); | 98 } while (result == MessageQueueMessageReceived && scriptDebugServer()->isPau
sed()); |
98 m_workerGlobalScope->thread()->didLeaveNestedLoop(); | 99 InspectorInstrumentation::didLeaveNestedRunLoop(m_workerGlobalScope.get()); |
99 | 100 |
100 // The listener may have been removed in the nested loop. | 101 // The listener may have been removed in the nested loop. |
101 if (m_listener) | 102 if (m_listener) |
102 m_listener->didContinue(); | 103 m_listener->didContinue(); |
103 } | 104 } |
104 | 105 |
105 void WorkerScriptDebugServer::quitMessageLoopOnPause() | 106 void WorkerScriptDebugServer::quitMessageLoopOnPause() |
106 { | 107 { |
107 // Nothing to do here in case of workers since runMessageLoopOnPause will ch
eck for paused state after each debugger command. | 108 // Nothing to do here in case of workers since runMessageLoopOnPause will ch
eck for paused state after each debugger command. |
108 } | 109 } |
109 | 110 |
110 } // namespace blink | 111 } // namespace blink |
OLD | NEW |