Changeset 83874 in webkit

Timestamp:

Apr 14, 2011 11:13:10 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-04-14 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

[v8] Web Inspector: add initial implementation of WorkerScriptDebugServer
​https://bugs.webkit.org/show_bug.cgi?id=58552

• bindings/v8/DebuggerScript.js:
• bindings/v8/WorkerContextExecutionProxy.cpp: (WebCore::WorkerContextExecutionProxy::initContextIfNeeded): each worker context now have a debug id (similar to frame contexts).
• bindings/v8/WorkerScriptDebugServer.cpp: (WebCore::retrieveWorkerContext): (WebCore::WorkerScriptDebugServer::WorkerScriptDebugServer): (WebCore::WorkerScriptDebugServer::addListener): (WebCore::WorkerScriptDebugServer::removeListener): (WebCore::WorkerScriptDebugServer::getDebugListenerForContext): (WebCore::WorkerScriptDebugServer::runMessageLoopOnPause): run message loop until debugger command is received and execution is resumed. (WebCore::WorkerScriptDebugServer::quitMessageLoopOnPause):
• bindings/v8/WorkerScriptDebugServer.h:
• inspector/WorkerDebuggerAgent.cpp: (WebCore::WorkerDebuggerAgent::startListeningScriptDebugServer): (WebCore::WorkerDebuggerAgent::stopListeningScriptDebugServer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/DebuggerScript.js (modified) (1 diff)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (1 diff)
• bindings/v8/WorkerScriptDebugServer.cpp (modified) (1 diff)
• bindings/v8/WorkerScriptDebugServer.h (modified) (1 diff)
• inspector/WorkerDebuggerAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [v8] Web Inspector: add initial implementation of WorkerScriptDebugServer
+        https://bugs.webkit.org/show_bug.cgi?id=58552
+
+        * bindings/v8/DebuggerScript.js:
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::initContextIfNeeded): each worker context
+        now have a debug id (similar to frame contexts).
+        * bindings/v8/WorkerScriptDebugServer.cpp:
+        (WebCore::retrieveWorkerContext):
+        (WebCore::WorkerScriptDebugServer::WorkerScriptDebugServer):
+        (WebCore::WorkerScriptDebugServer::addListener):
+        (WebCore::WorkerScriptDebugServer::removeListener):
+        (WebCore::WorkerScriptDebugServer::getDebugListenerForContext):
+        (WebCore::WorkerScriptDebugServer::runMessageLoopOnPause): run message loop until
+        debugger command is received and execution is resumed.
+        (WebCore::WorkerScriptDebugServer::quitMessageLoopOnPause):
+        * bindings/v8/WorkerScriptDebugServer.h:
+        * inspector/WorkerDebuggerAgent.cpp:
+        (WebCore::WorkerDebuggerAgent::startListeningScriptDebugServer):
+        (WebCore::WorkerDebuggerAgent::stopListeningScriptDebugServer):
+
 2011-04-14  Jian Li  <jianli@chromium.org>
 

trunk/Source/WebCore/bindings/v8/DebuggerScript.js

@@ -48 +48 @@
 }
 
+DebuggerScript.getWorkerScripts = function()
+{
+    var result = [];
+    var scripts = Debug.scripts();
+    for (var i = 0; i < scripts.length; ++i) {
+        var script = scripts[i];
+        // Workers don't share same V8 heap now so there is no need to complicate stuff with
+        // the context id like we do to discriminate between scripts from different pages.
+        // However we need to filter out v8 native scripts.
+        if (script.context_data && script.context_data === "worker")
+            result.push(DebuggerScript._formatScript(script));
+    }
+    return result;
+}
+
 DebuggerScript.getScripts = function(contextData)
 {

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -151 +151 @@
     v8::Context::Scope scope(context);
 
+    // Set DebugId for the new context.
+    context->SetData(v8::String::New("worker"));
+
     // Create a new JS object and use it as the prototype for the shadow global object.
     WrapperTypeInfo* contextType = &V8DedicatedWorkerContext::info;

trunk/Source/WebCore/bindings/v8/WorkerScriptDebugServer.cpp

@@ -34 +34 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
 
+#include "ScriptDebugListener.h"
+#include "V8DOMWrapper.h"
+#include "V8DedicatedWorkerContext.h"
+#include "V8SharedWorkerContext.h"
 #include "WorkerContext.h"
+#include "WorkerContextExecutionProxy.h"
+#include "WorkerThread.h"
+#include <v8.h>
+#include <wtf/MessageQueue.h>
 
 namespace WebCore {
 
+static WorkerContext* retrieveWorkerContext(v8::Handle<v8::Context> context)
+{
+    v8::Handle<v8::Object> global = context->Global();
+    ASSERT(!global.IsEmpty());
+
+    v8::Handle<v8::Object> prototype = v8::Handle<v8::Object>::Cast(global->GetPrototype());
+    ASSERT(!prototype.IsEmpty());
+
+    prototype = v8::Handle<v8::Object>::Cast(prototype->GetPrototype());
+    ASSERT(!prototype.IsEmpty());
+
+    WrapperTypeInfo* typeInfo = V8DOMWrapper::domWrapperType(prototype);
+    if (&V8DedicatedWorkerContext::info == typeInfo)
+        return V8DedicatedWorkerContext::toNative(prototype);
+    if (&V8SharedWorkerContext::info == typeInfo)
+        return V8SharedWorkerContext::toNative(prototype);
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
 WorkerScriptDebugServer::WorkerScriptDebugServer()
     : ScriptDebugServer()
+    , m_pausedWorkerContext(0)
 {
 }
 
-void WorkerScriptDebugServer::addListener(ScriptDebugListener*, WorkerContext*)
+void WorkerScriptDebugServer::addListener(ScriptDebugListener* listener, WorkerContext* workerContext)
 {
+    v8::HandleScope scope;
+    v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
+    v8::Context::Scope contextScope(debuggerContext);
+
+    if (!m_listenersMap.size()) {
+        // FIXME: synchronize access to this code.
+        ensureDebuggerScriptCompiled();
+        ASSERT(!m_debuggerScript.get()->IsUndefined());
+        v8::Debug::SetDebugEventListener2(&WorkerScriptDebugServer::v8DebugEventCallback, v8::External::New(this));
+    }
+    m_listenersMap.set(workerContext, listener);
+    
+    WorkerContextExecutionProxy* proxy = workerContext->script()->proxy();
+    if (!proxy)
+        return;
+    v8::Handle<v8::Context> context = proxy->context();
+
+    v8::Handle<v8::Function> getScriptsFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("getWorkerScripts")));
+    v8::Handle<v8::Value> argv[] = { v8::Handle<v8::Value>() };
+    v8::Handle<v8::Value> value = getScriptsFunction->Call(m_debuggerScript.get(), 0, argv);
+    if (value.IsEmpty())
+        return;
+    ASSERT(!value->IsUndefined() && value->IsArray());
+    v8::Handle<v8::Array> scriptsArray = v8::Handle<v8::Array>::Cast(value);
+    for (unsigned i = 0; i < scriptsArray->Length(); ++i)
+        dispatchDidParseSource(listener, v8::Handle<v8::Object>::Cast(scriptsArray->Get(v8::Integer::New(i))));
 }
 
-void WorkerScriptDebugServer::removeListener(ScriptDebugListener*, WorkerContext*)
+void WorkerScriptDebugServer::removeListener(ScriptDebugListener* listener, WorkerContext* workerContext)
 {
+    if (!m_listenersMap.contains(workerContext))
+        return;
+
+    if (m_pausedWorkerContext == workerContext)
+        continueProgram();
+
+    m_listenersMap.remove(workerContext);
+
+    if (m_listenersMap.isEmpty())
+        v8::Debug::SetDebugEventListener2(0);
+}
+
+ScriptDebugListener* WorkerScriptDebugServer::getDebugListenerForContext(v8::Handle<v8::Context> context)
+{
+    WorkerContext* workerContext = retrieveWorkerContext(context);
+    if (!workerContext)
+        return 0;
+    return m_listenersMap.get(workerContext);
+}
+
+void WorkerScriptDebugServer::runMessageLoopOnPause(v8::Handle<v8::Context> context)
+{
+    WorkerContext* workerContext = retrieveWorkerContext(context);
+    WorkerThread* workerThread = workerContext->thread();
+
+    m_pausedWorkerContext = workerContext;
+
+    MessageQueueWaitResult result;
+    do {
+        result = workerThread->runLoop().runInMode(workerContext, "debugger");
+    // Keep waiting until execution is resumed.
+    } while (result == MessageQueueMessageReceived && isPaused());
+    m_pausedWorkerContext = 0;
+    
+    // The listener may have been removed in the nested loop.
+    if (ScriptDebugListener* listener = m_listenersMap.get(workerContext))
+        listener->didContinue();
+}
+
+void WorkerScriptDebugServer::quitMessageLoopOnPause()
+{
+    // FIXME: do exit nested loop when listener is removed on pause.
 }
 

trunk/Source/WebCore/bindings/v8/WorkerScriptDebugServer.h

@@ -50 +50 @@
 
 private:
-    virtual ScriptDebugListener* getDebugListenerForContext(v8::Handle<v8::Context>) { return 0; }
-    virtual void runMessageLoopOnPause(v8::Handle<v8::Context>) { }
-    virtual void quitMessageLoopOnPause() { }
+    virtual ScriptDebugListener* getDebugListenerForContext(v8::Handle<v8::Context>);
+    virtual void runMessageLoopOnPause(v8::Handle<v8::Context>);
+    virtual void quitMessageLoopOnPause();
+
+    typedef HashMap<WorkerContext*, ScriptDebugListener*> ListenersMap;
+    ListenersMap m_listenersMap;
+    WorkerContext* m_pausedWorkerContext;
 };
 

trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp

@@ -55 +55 @@
 void WorkerDebuggerAgent::startListeningScriptDebugServer()
 {
+    scriptDebugServer().addListener(this, m_inspectedWorkerContext);
 }
 
 void WorkerDebuggerAgent::stopListeningScriptDebugServer()
 {
+    scriptDebugServer().removeListener(this, m_inspectedWorkerContext);
 }