[DevTools] Remove ScriptDebugListener from V8Debugger.

Source/core/inspector/V8Debugger.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 18 matching lines @@
  */
 
 #include "config.h"
 #include "core/inspector/V8Debugger.h"
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "bindings/core/v8/inspector/V8JavaScriptCallFrame.h"
 #include "core/inspector/JavaScriptCallFrame.h"
-#include "core/inspector/ScriptDebugListener.h"
 #include "platform/JSONValues.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Vector.h"
 #include "wtf/dtoa/utils.h"
 #include "wtf/text/CString.h"
 
 namespace blink {
 
 namespace {
 const char stepIntoV8MethodName[] = "stepIntoStatement";
@@ skipping 523 matching lines @@
     v8::Local<v8::Array> hitBreakpoints;
     thisPtr->handleProgramBreak(pausedScriptState, v8::Local<v8::Object>::Cast(info[0]), exception, hitBreakpoints);
 }
 
 void V8Debugger::handleProgramBreak(ScriptState* pausedScriptState, v8::Local<v8::Object> executionState, v8::Local<v8::Value> exception, v8::Local<v8::Array> hitBreakpointNumbers, bool isPromiseRejection)
 {
     // Don't allow nested breaks.
     if (m_runningNestedMessageLoop)
         return;
 
-    ScriptDebugListener* listener = m_client->getDebugListenerForContext(pausedScriptState->context());
-    if (!listener)
-        return;
-
     Vector<String> breakpointIds;
     if (!hitBreakpointNumbers.IsEmpty()) {
         breakpointIds.resize(hitBreakpointNumbers->Length());
         for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++) {
             v8::Local<v8::Value> hitBreakpointNumber = hitBreakpointNumbers->Get(i);
             ASSERT(!hitBreakpointNumber.IsEmpty() && hitBreakpointNumber->IsInt32());
             breakpointIds[i] = String::number(hitBreakpointNumber->Int32Value());
         }
     }
 
     m_pausedScriptState = pausedScriptState;
     m_executionState = executionState;
-    SkipPauseRequest result = listener->didPause(pausedScriptState, currentCallFrames(), ScriptValue(pausedScriptState, exception), breakpointIds, isPromiseRejection);
+    SkipPauseRequest result = m_client->didPause(pausedScriptState, currentCallFrames(), ScriptValue(pausedScriptState, exception), breakpointIds, isPromiseRejection);
     if (result == NoSkip) {
         m_runningNestedMessageLoop = true;
         m_client->runMessageLoopOnPause(pausedScriptState->context());
         m_runningNestedMessageLoop = false;
     }
     m_pausedScriptState.clear();
     m_executionState.Clear();
 
     if (result == StepFrame) {
         v8::Local<v8::Value> argv[] = { executionState };
@@ skipping 24 matching lines @@
 {
     if (!enabled())
         return;
     v8::DebugEvent event = eventDetails.GetEvent();
     if (event != v8::AsyncTaskEvent && event != v8::Break && event != v8::Exception && event != v8::AfterCompile && event != v8::BeforeCompile && event != v8::CompileError && event != v8::PromiseEvent)
         return;
 
     v8::Local<v8::Context> eventContext = eventDetails.GetEventContext();
     ASSERT(!eventContext.IsEmpty());
 
-    ScriptDebugListener* listener = m_client->getDebugListenerForContext(eventContext);
-    if (listener) {
-        v8::HandleScope scope(m_isolate);
-        if (event == v8::AfterCompile || event == v8::CompileError) {
-            v8::Context::Scope contextScope(debuggerContext());
-            v8::Local<v8::Value> argv[] = { eventDetails.GetEventData() };
-            v8::Local<v8::Value> value = callDebuggerMethod("getAfterCompileScript", 1, argv).ToLocalChecked();
-            ASSERT(value->IsObject());
-            v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
-            listener->didParseSource(createParsedScript(object, event != v8::AfterCompile ? CompileError : CompileSuccess));
-        } else if (event == v8::Exception) {
-            v8::Local<v8::Object> eventData = eventDetails.GetEventData();
-            v8::Local<v8::Value> exception = callInternalGetterFunction(eventData, "exception");
-            v8::Local<v8::Value> promise = callInternalGetterFunction(eventData, "promise");
-            bool isPromiseRejection = !promise.IsEmpty() && promise->IsObject();
-            handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), exception, v8::Local<v8::Array>(), isPromiseRejection);
-        } else if (event == v8::Break) {
-            v8::Local<v8::Value> argv[] = { eventDetails.GetEventData() };
-            v8::Local<v8::Value> hitBreakpoints = callDebuggerMethod("getBreakpointNumbers", 1, argv).ToLocalChecked();
-            ASSERT(hitBreakpoints->IsArray());
-            handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), v8::Local<v8::Value>(), hitBreakpoints.As<v8::Array>());
-        } else if (event == v8::AsyncTaskEvent) {
-            if (listener->v8AsyncTaskEventsEnabled())
-                handleV8AsyncTaskEvent(listener, ScriptState::from(eventContext), eventDetails.GetExecutionState(), eventDetails.GetEventData());
-        } else if (event == v8::PromiseEvent) {
-            if (listener->v8PromiseEventsEnabled())
-                handleV8PromiseEvent(listener, ScriptState::from(eventContext), eventDetails.GetExecutionState(), eventDetails.GetEventData());
-        }
+    v8::HandleScope scope(m_isolate);
+    if (event == v8::AfterCompile || event == v8::CompileError) {
+        v8::Context::Scope contextScope(debuggerContext());
+        v8::Local<v8::Value> argv[] = { eventDetails.GetEventData() };
+        v8::Local<v8::Value> value = callDebuggerMethod("getAfterCompileScript", 1, argv).ToLocalChecked();
+        ASSERT(value->IsObject());
+        v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
+        m_client->didParseSource(eventContext, createParsedScript(object, event != v8::AfterCompile ? CompileError : CompileSuccess));
+    } else if (event == v8::Exception) {
+        v8::Local<v8::Object> eventData = eventDetails.GetEventData();
+        v8::Local<v8::Value> exception = callInternalGetterFunction(eventData, "exception");
+        v8::Local<v8::Value> promise = callInternalGetterFunction(eventData, "promise");
+        bool isPromiseRejection = !promise.IsEmpty() && promise->IsObject();
+        handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), exception, v8::Local<v8::Array>(), isPromiseRejection);
+    } else if (event == v8::Break) {
+        v8::Local<v8::Value> argv[] = { eventDetails.GetEventData() };
+        v8::Local<v8::Value> hitBreakpoints = callDebuggerMethod("getBreakpointNumbers", 1, argv).ToLocalChecked();
+        ASSERT(hitBreakpoints->IsArray());
+        handleProgramBreak(ScriptState::from(eventContext), eventDetails.GetExecutionState(), v8::Local<v8::Value>(), hitBreakpoints.As<v8::Array>());
+    } else if (event == v8::AsyncTaskEvent) {
+        if (m_client->v8AsyncTaskEventsEnabled(ScriptState::from(eventContext)))
+            handleV8AsyncTaskEvent(ScriptState::from(eventContext), eventDetails.GetExecutionState(), eventDetails.GetEventData());
+    } else if (event == v8::PromiseEvent) {
+        if (m_client->v8PromiseEventsEnabled(ScriptState::from(eventContext)))
+            handleV8PromiseEvent(ScriptState::from(eventContext), eventDetails.GetExecutionState(), eventDetails.GetEventData());
     }
 }
 
-void V8Debugger::handleV8AsyncTaskEvent(ScriptDebugListener* listener, ScriptState* pausedScriptState, v8::Local<v8::Object> executionState, v8::Local<v8::Object> eventData)
+void V8Debugger::handleV8AsyncTaskEvent(ScriptState* pausedScriptState, v8::Local<v8::Object> executionState, v8::Local<v8::Object> eventData)
 {
     String type = toCoreStringWithUndefinedOrNullCheck(callInternalGetterFunction(eventData, "type"));
     String name = toCoreStringWithUndefinedOrNullCheck(callInternalGetterFunction(eventData, "name"));
     int id = callInternalGetterFunction(eventData, "id")->ToInteger(m_isolate)->Value();
 
     m_pausedScriptState = pausedScriptState;
     m_executionState = executionState;
-    listener->didReceiveV8AsyncTaskEvent(pausedScriptState, type, name, id);
+    m_client->didReceiveV8AsyncTaskEvent(pausedScriptState, type, name, id);
     m_pausedScriptState.clear();
     m_executionState.Clear();
 }
 
-void V8Debugger::handleV8PromiseEvent(ScriptDebugListener* listener, ScriptState* pausedScriptState, v8::Local<v8::Object> executionState, v8::Local<v8::Object> eventData)
+void V8Debugger::handleV8PromiseEvent(ScriptState* pausedScriptState, v8::Local<v8::Object> executionState, v8::Local<v8::Object> eventData)
 {
     v8::Local<v8::Value> argv[] = { eventData };
     v8::Local<v8::Value> value = callDebuggerMethod("getPromiseDetails", 1, argv).ToLocalChecked();
     ASSERT(value->IsObject());
     v8::Local<v8::Object> promiseDetails = v8::Local<v8::Object>::Cast(value);
     v8::Local<v8::Object> promise = promiseDetails->Get(v8InternalizedString("promise"))->ToObject(m_isolate);
     int status = promiseDetails->Get(v8InternalizedString("status"))->ToInteger(m_isolate)->Value();
     v8::Local<v8::Value> parentPromise = promiseDetails->Get(v8InternalizedString("parentPromise"));
 
     m_pausedScriptState = pausedScriptState;
     m_executionState = executionState;
-    listener->didReceiveV8PromiseEvent(pausedScriptState, promise, parentPromise, status);
+    m_client->didReceiveV8PromiseEvent(pausedScriptState, promise, parentPromise, status);
     m_pausedScriptState.clear();
     m_executionState.Clear();
 }
 
 V8Debugger::ParsedScript V8Debugger::createParsedScript(v8::Local<v8::Object> object, CompileResult compileResult)
 {
     v8::Local<v8::Value> id = object->Get(v8InternalizedString("id"));
     ASSERT(!id.IsEmpty() && id->IsInt32());
 
     ParsedScript parsedScript;
@@ skipping 89 matching lines @@
     return callDebuggerMethod("setFunctionVariableValue", 4, argv);
 }
 
 
 bool V8Debugger::isPaused()
 {
     return m_pausedScriptState;
 }
 
 } // namespace blink