Passing hit breakpoint IDs to ScriptDebugServer.

Source/bindings/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 388 matching lines @@
     void* p = v8::Handle<v8::External>::Cast(data)->Value();
     return static_cast<ScriptDebugServer*>(p);
 }
 
 v8::Handle<v8::Value> ScriptDebugServer::breakProgramCallback(const v8::Arguments& args)
 {
     ASSERT(2 == args.Length());
     
     ScriptDebugServer* thisPtr = toScriptDebugServer(args.Data());
     v8::Handle<v8::Value> exception;
-    thisPtr->breakProgram(v8::Handle<v8::Object>::Cast(args[0]), exception);
+    v8::Handle<v8::Array> hitBreakPoints;
+    thisPtr->breakProgram(v8::Handle<v8::Object>::Cast(args[0]), exception, hitBreakPoints);
     return v8::Undefined();
 }
 
-void ScriptDebugServer::breakProgram(v8::Handle<v8::Object> executionState, v8::Handle<v8::Value> exception)
+void ScriptDebugServer::breakProgram(v8::Handle<v8::Object> executionState, v8::Handle<v8::Value> exception, v8::Handle<v8::Array> hitBreakpointNumbers)
 {
     // Don't allow nested breaks.
     if (isPaused())
         return;
 
     ScriptDebugListener* listener = getDebugListenerForContext(m_pausedContext);
     if (!listener)
         return;
 
+    Vector<String> breakpointIDs;
+    if (!hitBreakpointNumbers.IsEmpty()) {
+        breakpointIDs.resize(hitBreakpointNumbers->Length());
+        for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++)
+            breakpointIDs[i] = toWebCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
+    }
+
     m_executionState.set(executionState);
     ScriptState* currentCallFrameState = ScriptState::forContext(m_pausedContext);
-    listener->didPause(currentCallFrameState, currentCallFrame(), ScriptValue(exception));
+    listener->didPause(currentCallFrameState, currentCallFrame(), ScriptValue(exception), breakpointIDs);
 
     m_runningNestedMessageLoop = true;
     runMessageLoopOnPause(m_pausedContext);
     m_runningNestedMessageLoop = false;
 }
 
 void ScriptDebugServer::v8DebugEventCallback(const v8::Debug::EventDetails& eventDetails)
 {
     ScriptDebugServer* thisPtr = toScriptDebugServer(eventDetails.GetCallbackData());
     thisPtr->handleV8DebugEvent(eventDetails);
@@ skipping 35 matching lines @@
             v8::Handle<v8::Value> scriptName = getScriptNameFunction->Call(m_debuggerScript.get(), 1, argv1);
 
             v8::Handle<v8::Function> setScriptSourceFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("setScriptSource")));
             String patchedScript = preprocessor->preprocessSourceCode(toWebCoreStringWithUndefinedOrNullCheck(script), toWebCoreStringWithUndefinedOrNullCheck(scriptName));
 
             v8::Handle<v8::Value> argv2[] = { eventDetails.GetEventData(), v8String(patchedScript, debugContext->GetIsolate()) };
             setScriptSourceFunction->Call(m_debuggerScript.get(), 2, argv2);
             m_scriptPreprocessor = preprocessor.release();
         } else if (event == v8::AfterCompile) {
             v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
-            v8::Handle<v8::Function> onAfterCompileFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::NewSymbol("getAfterCompileScript")));
+            v8::Handle<v8::Function> getAfterCompileFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::NewSymbol("getAfterCompileScript")));
             v8::Handle<v8::Value> argv[] = { eventDetails.GetEventData() };
-            v8::Handle<v8::Value> value = onAfterCompileFunction->Call(m_debuggerScript.get(), 1, argv);
+            v8::Handle<v8::Value> value = getAfterCompileFunction->Call(m_debuggerScript.get(), 1, argv);
             ASSERT(value->IsObject());
             v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
             dispatchDidParseSource(listener, object);
-        } else if (event == v8::Break || event == v8::Exception) {
+        } else if (event == v8::Exception) {
+            v8::Local<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(1);
+            // Stack trace is empty in case of syntax error. Silently continue execution in such cases.
+            if (!stackTrace->GetFrameCount())
+                return;
+            v8::Handle<v8::Object> eventData = eventDetails.GetEventData();
+            v8::Handle<v8::Value> exceptionGetterValue = eventData->Get(v8::String::NewSymbol("exception"));
+            ASSERT(!exceptionGetterValue.IsEmpty() && exceptionGetterValue->IsFunction());
+            v8::Handle<v8::Value> argv[] = { v8Undefined() };
+            V8RecursionScope::MicrotaskSuppression scope;
+            v8::Handle<v8::Value> exception = v8::Handle<v8::Function>::Cast(exceptionGetterValue)->Call(eventData, 0, argv);
+
+            v8::Handle<v8::Array> hitBreakpoints;
+            m_pausedContext = *eventContext;
+            breakProgram(eventDetails.GetExecutionState(), exception, hitBreakpoints);
+            m_pausedContext.Clear();
+        } else if (event == v8::Break) {
+            // v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
+            v8::Handle<v8::Function> getBreakpointNumbersFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::NewSymbol("getBreakpointNumbers")));
+            v8::Handle<v8::Value> argv[] = { eventDetails.GetEventData() };
+            v8::Handle<v8::Value> hitBreakpoints = getBreakpointNumbersFunction->Call(m_debuggerScript.get(), 1, argv);
+            ASSERT(hitBreakpoints.IsArray());
+
             v8::Handle<v8::Value> exception;
-            if (event == v8::Exception) {
-                v8::Local<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(1);
-                // Stack trace is empty in case of syntax error. Silently continue execution in such cases.
-                if (!stackTrace->GetFrameCount())
-                    return;
-                v8::Handle<v8::Object> eventData = eventDetails.GetEventData();
-                v8::Handle<v8::Value> exceptionGetterValue = eventData->Get(v8::String::NewSymbol("exception"));
-                ASSERT(!exceptionGetterValue.IsEmpty() && exceptionGetterValue->IsFunction());
-                v8::Handle<v8::Value> argv[] = { v8Undefined() };
-                V8RecursionScope::MicrotaskSuppression scope;
-                exception = v8::Handle<v8::Function>::Cast(exceptionGetterValue)->Call(eventData, 0, argv);
-            }

[yurys, 2013/05/16 19:52:53]

Can you put breakpoint ids retrieval into else if branch here and continue to
have breakProgram called in a single place?

[SeRya, 2013/05/30 07:45:57]

The code looks more clear for me without such an if. What the problem with
calling breakProgram twice? I don't think is code duplication. Instead I'd
suggest to change if/else sequence to switch.

-
             m_pausedContext = *eventContext;
-            breakProgram(eventDetails.GetExecutionState(), exception);
+            breakProgram(eventDetails.GetExecutionState(), exception, hitBreakpoints.As<v8::Array>());
             m_pausedContext.Clear();
         }
     }
 }
 
 void ScriptDebugServer::dispatchDidParseSource(ScriptDebugListener* listener, v8::Handle<v8::Object> object)
 {
     String sourceID = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8::String::NewSymbol("id")));
 
     ScriptDebugListener::Script script;
@@ skipping 119 matching lines @@
         *wasThrown = true;
         *result = ScriptValue(tryCatch.Exception());
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
             *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
     } else
         *result = ScriptValue(value);
 }
 
 } // namespace WebCore