Remove V8RecrusionScope, cleanup call sites.

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

Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp
index f4c81cc56f61d46d6e4fd8560e75c757f41f8f48..ff564ca6571c01f647b83c517c6b2e5f4cb076b2 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp
@@ -51,7 +51,7 @@ PassOwnPtr<InjectedScriptManager> InjectedScriptManager::create(V8DebuggerImpl*
 InjectedScriptManager::InjectedScriptManager(V8DebuggerImpl* debugger)
     : m_injectedScriptHost(InjectedScriptHost::create(debugger))
     , m_customObjectFormatterEnabled(false)
-    , m_client(debugger->client())
+    , m_debugger(debugger)
 {
 }
 
@@ -125,14 +125,14 @@ InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context>
         return it->second;
 
     v8::Local<v8::Context> callingContext = context->GetIsolate()->GetCallingContext();
-    if (!callingContext.IsEmpty() && !m_client->callingContextCanAccessContext(callingContext, context))
+    if (!callingContext.IsEmpty() && !m_debugger->client()->callingContextCanAccessContext(callingContext, context))
         return nullptr;
 
     OwnPtr<InjectedScriptNative> injectedScriptNative = adoptPtr(new InjectedScriptNative(context->GetIsolate()));
     String injectedScriptSource(reinterpret_cast<const char*>(InjectedScriptSource_js), sizeof(InjectedScriptSource_js));
 
     v8::Local<v8::Object> object = createInjectedScript(injectedScriptSource, context, contextId, injectedScriptNative.get());
-    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(this, context, object, m_client, injectedScriptNative.release(), contextId));
+    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(this, context, object, injectedScriptNative.release(), contextId));
     InjectedScript* resultPtr = result.get();
     if (m_customObjectFormatterEnabled)
         result->setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
@@ -152,7 +152,7 @@ v8::Local<v8::Object> InjectedScriptManager::createInjectedScript(const String&
         m_injectedScriptHost->setWrapperTemplate(wrapperTemplate, isolate);
     }
 
-    v8::Local<v8::Object> scriptHostWrapper = V8InjectedScriptHost::wrap(m_client, wrapperTemplate, context, m_injectedScriptHost.get());
+    v8::Local<v8::Object> scriptHostWrapper = V8InjectedScriptHost::wrap(wrapperTemplate, context, m_injectedScriptHost.get());
     if (scriptHostWrapper.IsEmpty())
         return v8::Local<v8::Object>();
 
@@ -163,15 +163,17 @@ v8::Local<v8::Object> InjectedScriptManager::createInjectedScript(const String&
     // inspector's stuff) the function is called a few lines below with InjectedScriptHost wrapper,
     // injected script id and explicit reference to the inspected global object. The function is expected
     // to create and configure InjectedScript instance that is going to be used by the inspector.
-    v8::Local<v8::Value> value;
-    if (!m_client->compileAndRunInternalScript(toV8String(isolate, source)).ToLocal(&value))
+    v8::Local<v8::Value> value = m_debugger->compileAndRunInternalScript(context, toV8String(isolate, source));
+    if (value.IsEmpty())
         return v8::Local<v8::Object>();
     ASSERT(value->IsFunction());
+    v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
 
     v8::Local<v8::Object> windowGlobal = context->Global();
     v8::Local<v8::Value> info[] = { scriptHostWrapper, windowGlobal, v8::Number::New(context->GetIsolate(), id) };
+    v8::MicrotasksScope microtasksScope(isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);

[pfeldman, 2016/03/08 20:23:21]

Do we need this?

[dgozman, 2016/03/09 22:01:53]

Yes, we do. This is a call into page context which may happen when there is no
V8 stack. We must annotate that we do not trigger microtasks here.

     v8::Local<v8::Value> injectedScriptValue;
-    if (!m_client->callInternalFunction(v8::Local<v8::Function>::Cast(value), windowGlobal, WTF_ARRAY_LENGTH(info), info).ToLocal(&injectedScriptValue))
+    if (!function->Call(context, windowGlobal, WTF_ARRAY_LENGTH(info), info).ToLocal(&injectedScriptValue))
         return v8::Local<v8::Object>();
     if (!injectedScriptValue->IsObject())
         return v8::Local<v8::Object>();