Revert of DevTools: respond with error when Debugger command is sent to disabled debugger agent

Source/bindings/core/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 86 matching lines @@
 
 DEFINE_TRACE(ScriptDebugServer)
 {
 }
 
 void ScriptDebugServer::enable()
 {
     ASSERT(!enabled());
     v8::HandleScope scope(m_isolate);
     v8::Debug::SetDebugEventListener(&ScriptDebugServer::v8DebugEventCallback, v8::External::New(m_isolate, this));
-    compileDebuggerScript();
+    ensureDebuggerScriptCompiled();
 }
 
 void ScriptDebugServer::disable()
 {
     ASSERT(enabled());
     clearBreakpoints();
     clearCompiledScripts();
     m_debuggerScript.Reset();
     v8::Debug::SetDebugEventListener(nullptr);
 }
@@ skipping 69 matching lines @@
     v8::HandleScope scope(m_isolate);
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     v8::Context::Scope contextScope(debuggerContext);
 
     v8::Local<v8::Function> clearBreakpoints = v8::Local<v8::Function>::Cast(debuggerScriptLocal()->Get(v8InternalizedString("clearBreakpoints")));
     v8::Debug::Call(clearBreakpoints);
 }
 
 void ScriptDebugServer::setBreakpointsActivated(bool activated)
 {
-    if (!enabled()) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
+    ensureDebuggerScriptCompiled();
     v8::HandleScope scope(m_isolate);
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     v8::Context::Scope contextScope(debuggerContext);
 
     v8::Local<v8::Object> info = v8::Object::New(m_isolate);
     info->Set(v8InternalizedString("enabled"), v8::Boolean::New(m_isolate, activated));
     v8::Local<v8::Function> setBreakpointsActivated = v8::Local<v8::Function>::Cast(debuggerScriptLocal()->Get(v8InternalizedString("setBreakpointsActivated")));
     v8::Debug::Call(setBreakpointsActivated, info);
 
     m_breakpointsActivated = activated;
 }
 
 ScriptDebugServer::PauseOnExceptionsState ScriptDebugServer::pauseOnExceptionsState()
 {
-    ASSERT(enabled());
+    ensureDebuggerScriptCompiled();
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
 
     v8::Local<v8::Value> argv[] = { v8Undefined() };
     v8::Local<v8::Value> result = callDebuggerMethod("pauseOnExceptionsState", 0, argv).ToLocalChecked();
     return static_cast<ScriptDebugServer::PauseOnExceptionsState>(result->Int32Value());
 }
 
 void ScriptDebugServer::setPauseOnExceptionsState(PauseOnExceptionsState pauseOnExceptionsState)
 {
-    ASSERT(enabled());
+    ensureDebuggerScriptCompiled();
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
 
     v8::Local<v8::Value> argv[] = { v8::Int32::New(m_isolate, pauseOnExceptionsState) };
     callDebuggerMethod("setPauseOnExceptionsState", 1, argv);
 }
 
 void ScriptDebugServer::setPauseOnNextStatement(bool pause)
 {
     ASSERT(!m_runningNestedMessageLoop);
@@ skipping 72 matching lines @@
     ASSERT(isPaused());
     ASSERT(!m_executionState.IsEmpty());
     v8::HandleScope handleScope(m_isolate);
     v8::Local<v8::Value> argv[] = { m_executionState };
     callDebuggerMethod(stepOutV8MethodName, 1, argv);
     continueProgram();
 }
 
 void ScriptDebugServer::clearStepping()
 {
-    ASSERT(enabled());
+    ensureDebuggerScriptCompiled();
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
 
     v8::Local<v8::Value> argv[] = { v8Undefined() };
     callDebuggerMethod("clearStepping", 0, argv);
 }
 
 bool ScriptDebugServer::setScriptSource(const String& sourceID, const String& newContent, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, ScriptValue* newCallFrames, RefPtr<JSONObject>* result)
 {
     class EnableLiveEditScope {
     public:
         explicit EnableLiveEditScope(v8::Isolate* isolate) : m_isolate(isolate) { v8::Debug::SetLiveEditEnabled(m_isolate, true); }
         ~EnableLiveEditScope() { v8::Debug::SetLiveEditEnabled(m_isolate, false); }
     private:
         v8::Isolate* m_isolate;
     };
 
-    ASSERT(enabled());
+    ensureDebuggerScriptCompiled();
     v8::HandleScope scope(m_isolate);
 
     OwnPtr<v8::Context::Scope> contextScope;
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     if (!isPaused())
         contextScope = adoptPtr(new v8::Context::Scope(debuggerContext));
 
     v8::Local<v8::Value> argv[] = { v8String(m_isolate, sourceID), v8String(m_isolate, newContent), v8Boolean(preview, m_isolate) };
 
     v8::Local<v8::Value> v8result;
@@ skipping 323 matching lines @@
         .setStartLine(object->Get(v8InternalizedString("startLine"))->ToInteger(m_isolate)->Value())
         .setStartColumn(object->Get(v8InternalizedString("startColumn"))->ToInteger(m_isolate)->Value())
         .setEndLine(object->Get(v8InternalizedString("endLine"))->ToInteger(m_isolate)->Value())
         .setEndColumn(object->Get(v8InternalizedString("endColumn"))->ToInteger(m_isolate)->Value())
         .setIsContentScript(object->Get(v8InternalizedString("isContentScript"))->ToBoolean(m_isolate)->Value())
         .setIsInternalScript(object->Get(v8InternalizedString("isInternalScript"))->ToBoolean(m_isolate)->Value());
 
     listener->didParseSource(sourceID, script, compileResult);
 }
 
-void ScriptDebugServer::compileDebuggerScript()
+void ScriptDebugServer::ensureDebuggerScriptCompiled()
 {
-    if (!m_debuggerScript.IsEmpty()) {
-        ASSERT_NOT_REACHED();
+    if (!m_debuggerScript.IsEmpty())
         return;
-    }
 
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
     v8::Local<v8::Object> value = m_client->compileDebuggerScript();
     if (value.IsEmpty())
         return;
     m_debuggerScript.Reset(m_isolate, value);
 }
 
 v8::Local<v8::Object> ScriptDebugServer::debuggerScriptLocal() const
 {
     return v8::Local<v8::Object>::New(m_isolate, m_debuggerScript);
 }
 
 v8::Local<v8::String> ScriptDebugServer::v8InternalizedString(const char* str) const
 {
     return v8::String::NewFromUtf8(m_isolate, str, v8::NewStringType::kInternalized).ToLocalChecked();
 }
 
 v8::Local<v8::Value> ScriptDebugServer::functionScopes(v8::Local<v8::Function> function)
 {
-    if (!enabled()) {
-        ASSERT_NOT_REACHED();
-        return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
-    }
+    ensureDebuggerScriptCompiled();
+
     v8::Local<v8::Value> argv[] = { function };
     return callDebuggerMethod("getFunctionScopes", 1, argv).ToLocalChecked();
 }
 
 v8::Local<v8::Value> ScriptDebugServer::generatorObjectDetails(v8::Local<v8::Object>& object)
 {
-    if (!enabled()) {
-        ASSERT_NOT_REACHED();
-        return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
-    }
+    ensureDebuggerScriptCompiled();
+
     v8::Local<v8::Value> argv[] = { object };
     return callDebuggerMethod("getGeneratorObjectDetails", 1, argv).ToLocalChecked();
 }
 
 v8::Local<v8::Value> ScriptDebugServer::collectionEntries(v8::Local<v8::Object>& object)
 {
-    if (!enabled()) {
-        ASSERT_NOT_REACHED();
-        return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
-    }
+    ensureDebuggerScriptCompiled();
+
     v8::Local<v8::Value> argv[] = { object };
     return callDebuggerMethod("getCollectionEntries", 1, argv).ToLocalChecked();
 }
 
 v8::Local<v8::Value> ScriptDebugServer::getInternalProperties(v8::Local<v8::Object>& object)
 {
-    if (!enabled()) {
-        // FIXME: provide a way to collect internal properties without enabling debugger. See crbug.com/485451
+    if (m_debuggerScript.IsEmpty())
         return v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
-    }
+
     v8::Local<v8::Value> argv[] = { object };
     return callDebuggerMethod("getInternalProperties", 1, argv).ToLocalChecked();
 }
 
 v8::MaybeLocal<v8::Value> ScriptDebugServer::setFunctionVariableValue(v8::Local<v8::Value> functionValue, int scopeNumber, const String& variableName, v8::Local<v8::Value> newValue)
 {
-    if (m_debuggerScript.IsEmpty()) {
-        ASSERT_NOT_REACHED();
+    if (m_debuggerScript.IsEmpty())
         return m_isolate->ThrowException(v8::String::NewFromUtf8(m_isolate, "Debugging is not enabled.", v8::NewStringType::kNormal).ToLocalChecked());
-    }
 
     v8::Local<v8::Value> argv[] = {
         functionValue,
         v8::Local<v8::Value>(v8::Integer::New(m_isolate, scopeNumber)),
         v8String(m_isolate, variableName),
         newValue
     };
     return callDebuggerMethod("setFunctionVariableValue", 4, argv);
 }
 
@@ skipping 62 matching lines @@
             *lineNumber = message->GetLineNumber();
             *columnNumber = message->GetStartColumn();
             v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace();
             if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
                 *stackTrace = createScriptCallStack(m_isolate, messageStackTrace, messageStackTrace->GetFrameCount());
         }
     }
 }
 
 } // namespace blink