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 16 matching lines...) Expand all Loading... |
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/v8/WorkerScriptDebugServer.h" | 32 #include "bindings/v8/WorkerScriptDebugServer.h" |
33 | 33 |
34 #include "bindings/v8/V8ScriptRunner.h" | 34 #include "bindings/v8/V8ScriptRunner.h" |
35 #include "core/inspector/ScriptDebugListener.h" | 35 #include "core/inspector/ScriptDebugListener.h" |
36 #include "core/inspector/WorkerDebuggerAgent.h" | 36 #include "core/inspector/WorkerDebuggerAgent.h" |
37 #include "core/workers/WorkerContext.h" | 37 #include "core/workers/WorkerGlobalScope.h" |
38 #include "core/workers/WorkerThread.h" | 38 #include "core/workers/WorkerThread.h" |
39 #include <v8.h> | 39 #include <v8.h> |
40 #include "wtf/MessageQueue.h" | 40 #include "wtf/MessageQueue.h" |
41 | 41 |
42 | 42 |
43 namespace WebCore { | 43 namespace WebCore { |
44 | 44 |
45 WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerContext* workerContext, c
onst String& mode) | 45 WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerGlobalScope* workerGlobal
Scope, const String& mode) |
46 : ScriptDebugServer(v8::Isolate::GetCurrent()) | 46 : ScriptDebugServer(v8::Isolate::GetCurrent()) |
47 , m_listener(0) | 47 , m_listener(0) |
48 , m_workerContext(workerContext) | 48 , m_workerGlobalScope(workerGlobalScope) |
49 , m_debuggerTaskMode(mode) | 49 , m_debuggerTaskMode(mode) |
50 { | 50 { |
51 ASSERT(m_isolate); | 51 ASSERT(m_isolate); |
52 } | 52 } |
53 | 53 |
54 void WorkerScriptDebugServer::addListener(ScriptDebugListener* listener) | 54 void WorkerScriptDebugServer::addListener(ScriptDebugListener* listener) |
55 { | 55 { |
56 v8::HandleScope scope(m_isolate); | 56 v8::HandleScope scope(m_isolate); |
57 v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext(); | 57 v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext(); |
58 v8::Context::Scope contextScope(debuggerContext); | 58 v8::Context::Scope contextScope(debuggerContext); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Han
dle<v8::Context>) | 91 ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Han
dle<v8::Context>) |
92 { | 92 { |
93 // There is only one worker context in isolate. | 93 // There is only one worker context in isolate. |
94 return m_listener; | 94 return m_listener; |
95 } | 95 } |
96 | 96 |
97 void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Handle<v8::Context>) | 97 void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Handle<v8::Context>) |
98 { | 98 { |
99 MessageQueueWaitResult result; | 99 MessageQueueWaitResult result; |
100 do { | 100 do { |
101 result = m_workerContext->thread()->runLoop().runInMode(m_workerContext,
m_debuggerTaskMode); | 101 result = m_workerGlobalScope->thread()->runLoop().runInMode(m_workerGlob
alScope, m_debuggerTaskMode); |
102 // Keep waiting until execution is resumed. | 102 // Keep waiting until execution is resumed. |
103 } while (result == MessageQueueMessageReceived && isPaused()); | 103 } while (result == MessageQueueMessageReceived && isPaused()); |
104 | 104 |
105 // The listener may have been removed in the nested loop. | 105 // The listener may have been removed in the nested loop. |
106 if (m_listener) | 106 if (m_listener) |
107 m_listener->didContinue(); | 107 m_listener->didContinue(); |
108 } | 108 } |
109 | 109 |
110 void WorkerScriptDebugServer::quitMessageLoopOnPause() | 110 void WorkerScriptDebugServer::quitMessageLoopOnPause() |
111 { | 111 { |
112 // Nothing to do here in case of workers since runMessageLoopOnPause will ch
eck for paused state after each debugger command. | 112 // Nothing to do here in case of workers since runMessageLoopOnPause will ch
eck for paused state after each debugger command. |
113 } | 113 } |
114 | 114 |
115 } // namespace WebCore | 115 } // namespace WebCore |
OLD | NEW |