[DevTools] Pass bindRemoteObject function to Custom Formatter directly

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

 /*
  * 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:
  *
  *     * 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 395 matching lines @@
     findInjectedScript(session);
     if (!m_injectedScript)
         return false;
     m_context = m_injectedScript->context()->context();
     m_context->Enter();
     return true;
 }
 
 bool InjectedScript::Scope::installCommandLineAPI()
 {
-    ASSERT(m_injectedScript && !m_context.IsEmpty());
+    DCHECK(m_injectedScript && !m_context.IsEmpty() && m_global.IsEmpty());
     v8::Local<v8::Object> extensionObject;
     if (!m_injectedScript->commandLineAPI(m_errorString).ToLocal(&extensionObject))
         return false;
-    return installGlobalObjectExtension(extensionObject);
-}
-
-bool InjectedScript::Scope::installRemoteObjectAPI(const String16& objectGroupName)
-{
-    ASSERT(m_injectedScript && !m_context.IsEmpty());
-    V8FunctionCall function(m_debugger, m_context, m_injectedScript->v8Value(), "remoteObjectAPI");
-    function.appendArgument(objectGroupName);
-    bool hadException = false;
-    v8::Local<v8::Value> extension = function.call(hadException, false);
-    if (hadException || extension.IsEmpty() || !extension->IsObject()) {
+    m_extensionPrivate = V8Debugger::scopeExtensionPrivate(m_debugger->isolate());
+    v8::Local<v8::Object> global = m_context->Global();
+    if (!global->SetPrivate(m_context, m_extensionPrivate, extensionObject).FromMaybe(false)) {
         *m_errorString = "Internal error";
         return false;
     }
-    v8::Local<v8::Object> extensionObject = extension.As<v8::Object>();
-    return installGlobalObjectExtension(extensionObject);
-}
-
-bool InjectedScript::Scope::installGlobalObjectExtension(v8::Local<v8::Object> extension)
-{
-    ASSERT(m_global.IsEmpty());
-    m_extensionPrivate = V8Debugger::scopeExtensionPrivate(m_debugger->isolate());
-    v8::Local<v8::Object> global = m_context->Global();
-    if (!global->SetPrivate(m_context, m_extensionPrivate, extension).FromMaybe(false)) {
-        *m_errorString = "Internal error";
-        return false;
-    }
     m_global = global;
     return true;
 }
 
 void InjectedScript::Scope::ignoreExceptionsAndMuteConsole()
 {
     ASSERT(!m_ignoreExceptionsAndMuteConsole);
     m_ignoreExceptionsAndMuteConsole = true;
     m_debugger->client()->muteConsole();
     m_previousPauseOnExceptionsState = setPauseOnExceptionsState(V8DebuggerImpl::DontPauseOnExceptions);
@@ skipping 93 matching lines @@
 void InjectedScript::CallFrameScope::findInjectedScript(V8InspectorSessionImpl* session)
 {
     OwnPtr<RemoteCallFrameId> remoteId = RemoteCallFrameId::parse(m_errorString, m_remoteCallFrameId);
     if (!remoteId)
         return;
     m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal());
     m_injectedScript = session->findInjectedScript(m_errorString, remoteId.get());
 }
 
 } // namespace blink