[DevTools] Move part of CommandLineAPI to native

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 21 matching lines @@
 
 #include "platform/inspector_protocol/Parser.h"
 #include "platform/inspector_protocol/String16.h"
 #include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/InjectedScriptHost.h"
 #include "platform/v8_inspector/InjectedScriptNative.h"
 #include "platform/v8_inspector/InjectedScriptSource.h"
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/RemoteObjectId.h"
 #include "platform/v8_inspector/V8Compat.h"
+#include "platform/v8_inspector/V8Console.h"
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 #include "platform/v8_inspector/V8FunctionCall.h"
 #include "platform/v8_inspector/V8InjectedScriptHost.h"
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
 #include "platform/v8_inspector/V8StackTraceImpl.h"
 #include "platform/v8_inspector/V8StringUtil.h"
 #include "platform/v8_inspector/public/V8Debugger.h"
 #include "platform/v8_inspector/public/V8DebuggerClient.h"
 #include "platform/v8_inspector/public/V8ToProtocolValue.h"
 
@@ skipping 350 matching lines @@
     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());
-    V8FunctionCall function(m_debugger, m_context, m_injectedScript->v8Value(), "commandLineAPI");
+    V8FunctionCall function(m_debugger, m_context, m_injectedScript->v8Value(), "installCommandLineAPI");
+    function.appendArgument(V8Console::createCommandLineAPI(m_context, m_injectedScript->context()));

[dgozman, 2016/04/25 18:09:50]

InspectedContext is enough to pass.

[kozy, 2016/04/25 19:31:06]

Done.

     v8::Local<v8::Object> extensionObject;
     if (!installGlobalObjectExtension(function).ToLocal(&extensionObject))
         return false;
     return extensionObject->Set(m_context, toV8StringInternalized(m_context->GetIsolate(), "$_"), m_injectedScript->lastEvaluationResult()).FromMaybe(false);
 }
 
 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);
     v8::Local<v8::Object> extensionObject;
     return installGlobalObjectExtension(function).ToLocal(&extensionObject);
 }
 
 v8::MaybeLocal<v8::Object> InjectedScript::Scope::installGlobalObjectExtension(V8FunctionCall& function)
 {
     bool hadException = false;
     v8::Local<v8::Value> extension = function.call(hadException, false);
     if (hadException || extension.IsEmpty() || !extension->IsObject()) {
         *m_errorString = "Internal error";
         return v8::MaybeLocal<v8::Object>();
     }
 
     ASSERT(m_global.IsEmpty());
-    m_extensionSymbol = V8Debugger::scopeExtensionSymbol(m_debugger->isolate());
+    m_extensionPrivate = V8Debugger::scopeExtensionPrivate(m_debugger->isolate());
     v8::Local<v8::Object> global = m_context->Global();
-    if (!global->Set(m_context, m_extensionSymbol, extension).FromMaybe(false)) {
+    if (!global->SetPrivate(m_context, m_extensionPrivate, extension).FromMaybe(false)) {
         *m_errorString = "Internal error";
         return v8::MaybeLocal<v8::Object>();
     }
 
     m_global = global;
     return extension.As<v8::Object>();
 }
 
 void InjectedScript::Scope::ignoreExceptionsAndMuteConsole()
 {
@@ skipping 11 matching lines @@
     if (presentState != newState)
         m_debugger->setPauseOnExceptionsState(newState);
     return presentState;
 }
 
 void InjectedScript::Scope::cleanup()
 {
     v8::Local<v8::Object> global;
     if (m_global.ToLocal(&global)) {
         ASSERT(!m_context.IsEmpty());
-        global->Delete(m_context, m_extensionSymbol);
+        global->DeletePrivate(m_context, m_extensionPrivate);
         m_global = v8::MaybeLocal<v8::Object>();
     }
     if (!m_context.IsEmpty()) {
         m_context->Exit();
         m_context.Clear();
     }
 }
 
 InjectedScript::Scope::~Scope()
 {
@@ skipping 56 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