Revert of Remove V8RecrusionScope, cleanup call sites. (patchset #8 id:140001 of https://codereview…

third_party/WebKit/Source/platform/v8_inspector/V8InjectedScriptHost.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/v8_inspector/V8InjectedScriptHost.h"
 
 #include "platform/inspector_protocol/String16.h"
 #include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/InjectedScript.h"
 #include "platform/v8_inspector/InjectedScriptHost.h"
@@ skipping 262 matching lines @@
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "The argument must be a string.")));
         return;
     }
 
     ASSERT(isolate->InContext());
     v8::TryCatch tryCatch(isolate);
     v8::Local<v8::Value> result;
     InjectedScriptHost* host = V8InjectedScriptHost::unwrap(isolate->GetCurrentContext(), info.Holder());
     if (!host->debugger())
         return;
-    if (!host->debugger()->compileAndRunInternalScript(isolate->GetCurrentContext(), expression).ToLocal(&result)) {
+    if (!host->debugger()->client()->compileAndRunInternalScript(expression).ToLocal(&result)) {
         v8SetReturnValue(info, tryCatch.ReThrow());
         return;
     }
     v8SetReturnValue(info, result);
 }
 
 static void setExceptionAsReturnValue(const v8::FunctionCallbackInfo<v8::Value>& info, v8::Local<v8::Object> returnValue, v8::TryCatch& tryCatch)
 {
     v8::Isolate* isolate = info.GetIsolate();
     returnValue->Set(v8::String::NewFromUtf8(isolate, "result"), tryCatch.Exception());
@@ skipping 32 matching lines @@
         return;
     }
 
     v8::Local<v8::Symbol> commandLineAPISymbolValue = V8Debugger::commandLineAPISymbol(isolate);
     v8::Local<v8::Object> global = context->Global();
     if (info.Length() >= 2 && info[1]->IsObject()) {
         v8::Local<v8::Object> commandLineAPI = info[1]->ToObject(isolate);
         global->Set(commandLineAPISymbolValue, commandLineAPI);
     }
 
-    v8::MaybeLocal<v8::Value> result = host->debugger()->runCompiledScript(context, script);
+    v8::MaybeLocal<v8::Value> result = host->debugger()->client()->runCompiledScript(context, script);
     if (result.IsEmpty()) {
         global->Delete(context, commandLineAPISymbolValue);
         setExceptionAsReturnValue(info, wrappedResult, tryCatch);
         return;
     }
 
     global->Delete(context, commandLineAPISymbolValue);
     wrappedResult->Set(v8::String::NewFromUtf8(isolate, "result"), result.ToLocalChecked());
     wrappedResult->Set(v8::String::NewFromUtf8(isolate, "exceptionDetails"), v8::Undefined(isolate));
     v8SetReturnValue(info, wrappedResult);
@@ skipping 242 matching lines @@
 } // namespace
 
 v8::Local<v8::FunctionTemplate> V8InjectedScriptHost::createWrapperTemplate(v8::Isolate* isolate)
 {
     protocol::Vector<InspectorWrapperBase::V8MethodConfiguration> methods(WTF_ARRAY_LENGTH(V8InjectedScriptHostMethods));
     std::copy(V8InjectedScriptHostMethods, V8InjectedScriptHostMethods + WTF_ARRAY_LENGTH(V8InjectedScriptHostMethods), methods.begin());
     protocol::Vector<InspectorWrapperBase::V8AttributeConfiguration> attributes;
     return InjectedScriptHostWrapper::createWrapperTemplate(isolate, methods, attributes);
 }
 
-v8::Local<v8::Object> V8InjectedScriptHost::wrap(v8::Local<v8::FunctionTemplate> constructorTemplate, v8::Local<v8::Context> context, InjectedScriptHost* host)
+v8::Local<v8::Object> V8InjectedScriptHost::wrap(V8DebuggerClient* client, v8::Local<v8::FunctionTemplate> constructorTemplate, v8::Local<v8::Context> context, InjectedScriptHost* host)
 {
-    return InjectedScriptHostWrapper::wrap(constructorTemplate, context, host);
+    return InjectedScriptHostWrapper::wrap(client, constructorTemplate, context, host);
 }
 
 InjectedScriptHost* V8InjectedScriptHost::unwrap(v8::Local<v8::Context> context, v8::Local<v8::Object> object)
 {
     return InjectedScriptHostWrapper::unwrap(context, object);
 }
 
 } // namespace blink