Revert of Remove V8RecrusionScope, cleanup call sites.

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 33 matching lines @@
 namespace blink {
 
 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::create(V8DebuggerImpl* debugger)
 {
     return adoptPtr(new InjectedScriptManager(debugger));
 }
 
 InjectedScriptManager::InjectedScriptManager(V8DebuggerImpl* debugger)
     : m_injectedScriptHost(InjectedScriptHost::create(debugger))
     , m_customObjectFormatterEnabled(false)
-    , m_debugger(debugger)
+    , m_client(debugger->client())
 {
 }
 
 InjectedScriptManager::~InjectedScriptManager()
 {
     m_injectedScriptHost->disconnect();
 }
 
 InjectedScriptHost* InjectedScriptManager::injectedScriptHost()
 {
@@ skipping 53 matching lines @@
 InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context> context)
 {
     v8::Context::Scope scope(context);
     int contextId = V8Debugger::contextId(context);
 
     IdToInjectedScriptMap::iterator it = m_idToInjectedScript.find(contextId);
     if (it != m_idToInjectedScript.end())
         return it->second;
 
     v8::Local<v8::Context> callingContext = context->GetIsolate()->GetCallingContext();
-    if (!callingContext.IsEmpty() && !m_debugger->client()->callingContextCanAccessContext(callingContext, context))
+    if (!callingContext.IsEmpty() && !m_client->callingContextCanAccessContext(callingContext, context))
         return nullptr;
 
     OwnPtr<InjectedScriptNative> injectedScriptNative = adoptPtr(new InjectedScriptNative(context->GetIsolate()));
     String16 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, injectedScriptNative.release(), contextId));
+    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(this, context, object, m_client, injectedScriptNative.release(), contextId));
     InjectedScript* resultPtr = result.get();
     if (m_customObjectFormatterEnabled)
         result->setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
     m_idToInjectedScript.set(contextId, result.release());
 
     return resultPtr;
 }
 
 v8::Local<v8::Object> InjectedScriptManager::createInjectedScript(const String16& source, v8::Local<v8::Context> context, int id, InjectedScriptNative* injectedScriptNative)
 {
     v8::Isolate* isolate = context->GetIsolate();
     v8::Context::Scope scope(context);
 
     v8::Local<v8::FunctionTemplate> wrapperTemplate = m_injectedScriptHost->wrapperTemplate(isolate);
     if (wrapperTemplate.IsEmpty()) {
         wrapperTemplate = V8InjectedScriptHost::createWrapperTemplate(isolate);
         m_injectedScriptHost->setWrapperTemplate(wrapperTemplate, isolate);
     }
 
-    v8::Local<v8::Object> scriptHostWrapper = V8InjectedScriptHost::wrap(wrapperTemplate, context, m_injectedScriptHost.get());
+    v8::Local<v8::Object> scriptHostWrapper = V8InjectedScriptHost::wrap(m_client, wrapperTemplate, context, m_injectedScriptHost.get());
     if (scriptHostWrapper.IsEmpty())
         return v8::Local<v8::Object>();
 
     injectedScriptNative->setOnInjectedScriptHost(scriptHostWrapper);
 
     // Inject javascript into the context. The compiled script is supposed to evaluate into
     // a single anonymous function(it's anonymous to avoid cluttering the global object with
     // 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_debugger->compileAndRunInternalScript(context, toV8String(isolate, source)).ToLocal(&value))
+    if (!m_client->compileAndRunInternalScript(toV8String(isolate, source)).ToLocal(&value))
         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);
     v8::Local<v8::Value> injectedScriptValue;
-    if (!function->Call(context, windowGlobal, WTF_ARRAY_LENGTH(info), info).ToLocal(&injectedScriptValue))
+    if (!m_client->callInternalFunction(v8::Local<v8::Function>::Cast(value), windowGlobal, WTF_ARRAY_LENGTH(info), info).ToLocal(&injectedScriptValue))
         return v8::Local<v8::Object>();
     if (!injectedScriptValue->IsObject())
         return v8::Local<v8::Object>();
     return injectedScriptValue.As<v8::Object>();
 }
 
 } // namespace blink