[inspector] move console to builtins

src/inspector/v8-console.cc

 // Copyright 2016 the V8 project 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 "src/inspector/v8-console.h"
 
 #include "src/base/macros.h"
 #include "src/inspector/injected-script.h"
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/string-util.h"
@@ skipping 10 matching lines @@
 
 namespace v8_inspector {
 
 namespace {
 
 class ConsoleHelper {
  public:
   explicit ConsoleHelper(const v8::FunctionCallbackInfo<v8::Value>& info,
                          V8InspectorImpl* inspector)
       : m_info(info),
-        m_isolate(info.GetIsolate()),
-        m_context(info.GetIsolate()->GetCurrentContext()),
+        m_isolate(inspector->isolate()),
+        m_context(m_isolate->GetCurrentContext()),
         m_inspector(inspector),
         m_contextId(InspectedContext::contextId(m_context)),
         m_groupId(m_inspector->contextGroupId(m_contextId)) {}
 
   int contextId() const { return m_contextId; }
   int groupId() const { return m_groupId; }
 
   InjectedScript* injectedScript() {
     InspectedContext* context = m_inspector->getContext(m_groupId, m_contextId);
     if (!context) return nullptr;
@@ skipping 140 matching lines @@
                                             context->GetIsolate(), "toString"),
                          toStringFunction);
   }
   createDataProperty(context, console, funcName, func);
 }
 
 }  // namespace
 
 V8Console::V8Console(V8InspectorImpl* inspector) : m_inspector(inspector) {}
 
-void V8Console::debugCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Debug(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kDebug);
 }
 
-void V8Console::errorCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Error(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kError);
 }
 
-void V8Console::infoCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Info(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kInfo);
 }
 
-void V8Console::logCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Log(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kLog);
 }
 
-void V8Console::warnCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Warn(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kWarning);
 }
 
-void V8Console::dirCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Dir(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kDir);
 }
 
-void V8Console::dirxmlCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::DirXml(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kDirXML);
 }
 
-void V8Console::tableCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Table(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector).reportCall(ConsoleAPIType::kTable);
 }
 
-void V8Console::traceCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Trace(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportCallWithDefaultArgument(ConsoleAPIType::kTrace,
                                      String16("console.trace"));
 }
 
-void V8Console::groupCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Group(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportCallWithDefaultArgument(ConsoleAPIType::kStartGroup,
                                      String16("console.group"));
 }
 
-void V8Console::groupCollapsedCallback(
+void V8Console::GroupCollapsed(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportCallWithDefaultArgument(ConsoleAPIType::kStartGroupCollapsed,
                                      String16("console.groupCollapsed"));
 }
 
-void V8Console::groupEndCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::GroupEnd(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportCallWithDefaultArgument(ConsoleAPIType::kEndGroup,
                                      String16("console.groupEnd"));
 }
 
-void V8Console::clearCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Clear(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   if (!helper.groupId()) return;
   m_inspector->client()->consoleClear(helper.groupId());
   helper.reportCallWithDefaultArgument(ConsoleAPIType::kClear,
                                        String16("console.clear"));
 }
 
-void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Count(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   String16 title = helper.firstArgToString(String16());
   String16 identifier;
   if (title.isEmpty()) {
     std::unique_ptr<V8StackTraceImpl> stackTrace =
         V8StackTraceImpl::capture(m_inspector->debugger(), 0, 1);
     if (stackTrace && !stackTrace->isEmpty()) {
       identifier = toString16(stackTrace->topSourceURL()) + ":" +
                    String16::fromInteger(stackTrace->topLineNumber());
     }
   } else {
     identifier = title + "@";
   }
 
   int count =
       helper.consoleMessageStorage()->count(helper.contextId(), identifier);
   String16 countString = String16::fromInteger(count);
   helper.reportCallWithArgument(
       ConsoleAPIType::kCount,
       title.isEmpty() ? countString : (title + ": " + countString));
 }
 
-void V8Console::assertCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Assert(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   if (helper.firstArgToBoolean(false)) return;
 
   std::vector<v8::Local<v8::Value>> arguments;
   for (int i = 1; i < info.Length(); ++i) arguments.push_back(info[i]);
   if (info.Length() < 2)
     arguments.push_back(
-        toV8String(info.GetIsolate(), String16("console.assert")));
+        toV8String(m_inspector->isolate(), String16("console.assert")));
   helper.reportCall(ConsoleAPIType::kAssert, arguments);
 
   if (V8DebuggerAgentImpl* debuggerAgent = helper.debuggerAgent())
     debuggerAgent->breakProgramOnException(
         protocol::Debugger::Paused::ReasonEnum::Assert, nullptr);
 }
 
-void V8Console::markTimelineCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::MarkTimeline(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportDeprecatedCall("V8Console#markTimelineDeprecated",
                             "'console.markTimeline' is "
                             "deprecated. Please use "
                             "'console.timeStamp' instead.");
-  timeStampCallback(info);
+  TimeStamp(info);
 }
 
-void V8Console::profileCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Profile(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   if (V8ProfilerAgentImpl* profilerAgent = helper.profilerAgent())
     profilerAgent->consoleProfile(helper.firstArgToString(String16()));
 }
 
-void V8Console::profileEndCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::ProfileEnd(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   if (V8ProfilerAgentImpl* profilerAgent = helper.profilerAgent())
     profilerAgent->consoleProfileEnd(helper.firstArgToString(String16()));
 }
 
 static void timeFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
                          bool timelinePrefix, V8InspectorImpl* inspector) {
   ConsoleHelper helper(info, inspector);
   String16 protocolTitle = helper.firstArgToString("default");
   if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
   inspector->client()->consoleTime(toStringView(protocolTitle));
   helper.consoleMessageStorage()->time(helper.contextId(), protocolTitle);
 }
 
 static void timeEndFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
                             bool timelinePrefix, V8InspectorImpl* inspector) {
   ConsoleHelper helper(info, inspector);
   String16 protocolTitle = helper.firstArgToString("default");
   if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
   inspector->client()->consoleTimeEnd(toStringView(protocolTitle));
   double elapsed = helper.consoleMessageStorage()->timeEnd(helper.contextId(),
                                                            protocolTitle);
   String16 message =
       protocolTitle + ": " + String16::fromDouble(elapsed) + "ms";
   helper.reportCallWithArgument(ConsoleAPIType::kTimeEnd, message);
 }
 
-void V8Console::timelineCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Timeline(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportDeprecatedCall("V8Console#timeline",
                             "'console.timeline' is deprecated. Please use "
                             "'console.time' instead.");
   timeFunction(info, true, m_inspector);
 }
 
-void V8Console::timelineEndCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::TimelineEnd(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info, m_inspector)
       .reportDeprecatedCall("V8Console#timelineEnd",
                             "'console.timelineEnd' is "
                             "deprecated. Please use "
                             "'console.timeEnd' instead.");
   timeEndFunction(info, true, m_inspector);
 }
 
-void V8Console::timeCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::Time(const v8::FunctionCallbackInfo<v8::Value>& info) {
   timeFunction(info, false, m_inspector);
 }
 
-void V8Console::timeEndCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::TimeEnd(const v8::FunctionCallbackInfo<v8::Value>& info) {
   timeEndFunction(info, false, m_inspector);
 }
 
-void V8Console::timeStampCallback(
-    const v8::FunctionCallbackInfo<v8::Value>& info) {
+void V8Console::TimeStamp(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info, m_inspector);
   String16 title = helper.firstArgToString(String16());
   m_inspector->client()->consoleTimeStamp(toStringView(title));
 }
 
 void V8Console::memoryGetterCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   v8::Local<v8::Value> memoryValue;
   if (!m_inspector->client()
            ->memoryInfo(info.GetIsolate(),
@@ skipping 165 matching lines @@
   if (V8InspectorSessionImpl* session = helper.currentSession()) {
     V8InspectorSession::Inspectable* object = session->inspectedObject(num);
     v8::Isolate* isolate = info.GetIsolate();
     if (object)
       info.GetReturnValue().Set(object->get(isolate->GetCurrentContext()));
     else
       info.GetReturnValue().Set(v8::Undefined(isolate));
   }
 }
 
-v8::Local<v8::Object> V8Console::createConsole(v8::Local<v8::Context> context) {
-  v8::Context::Scope contextScope(context);
-  v8::Isolate* isolate = context->GetIsolate();
-  v8::MicrotasksScope microtasksScope(isolate,
-                                      v8::MicrotasksScope::kDoNotRunMicrotasks);
-
-  v8::Local<v8::Object> console = v8::Object::New(isolate);
-  bool success =
-      console->SetPrototype(context, v8::Object::New(isolate)).FromMaybe(false);
-  DCHECK(success);
-  USE(success);
-
-  v8::Local<v8::External> data = v8::External::New(isolate, this);
-  createBoundFunctionProperty(context, console, data, "debug",
-                              &V8Console::call<&V8Console::debugCallback>);
-  createBoundFunctionProperty(context, console, data, "error",
-                              &V8Console::call<&V8Console::errorCallback>);
-  createBoundFunctionProperty(context, console, data, "info",
-                              &V8Console::call<&V8Console::infoCallback>);
-  createBoundFunctionProperty(context, console, data, "log",
-                              &V8Console::call<&V8Console::logCallback>);
-  createBoundFunctionProperty(context, console, data, "warn",
-                              &V8Console::call<&V8Console::warnCallback>);
-  createBoundFunctionProperty(context, console, data, "dir",
-                              &V8Console::call<&V8Console::dirCallback>);
-  createBoundFunctionProperty(context, console, data, "dirxml",
-                              &V8Console::call<&V8Console::dirxmlCallback>);
-  createBoundFunctionProperty(context, console, data, "table",
-                              &V8Console::call<&V8Console::tableCallback>);
-  createBoundFunctionProperty(context, console, data, "trace",
-                              &V8Console::call<&V8Console::traceCallback>);
-  createBoundFunctionProperty(context, console, data, "group",
-                              &V8Console::call<&V8Console::groupCallback>);
-  createBoundFunctionProperty(
-      context, console, data, "groupCollapsed",
-      &V8Console::call<&V8Console::groupCollapsedCallback>);
-  createBoundFunctionProperty(context, console, data, "groupEnd",
-                              &V8Console::call<&V8Console::groupEndCallback>);
-  createBoundFunctionProperty(context, console, data, "clear",
-                              &V8Console::call<&V8Console::clearCallback>);
-  createBoundFunctionProperty(context, console, data, "count",
-                              &V8Console::call<&V8Console::countCallback>);
-  createBoundFunctionProperty(context, console, data, "assert",
-                              &V8Console::call<&V8Console::assertCallback>);
-  createBoundFunctionProperty(
-      context, console, data, "markTimeline",
-      &V8Console::call<&V8Console::markTimelineCallback>);
-  createBoundFunctionProperty(context, console, data, "profile",
-                              &V8Console::call<&V8Console::profileCallback>);
-  createBoundFunctionProperty(context, console, data, "profileEnd",
-                              &V8Console::call<&V8Console::profileEndCallback>);
-  createBoundFunctionProperty(context, console, data, "timeline",
-                              &V8Console::call<&V8Console::timelineCallback>);
-  createBoundFunctionProperty(
-      context, console, data, "timelineEnd",
-      &V8Console::call<&V8Console::timelineEndCallback>);
-  createBoundFunctionProperty(context, console, data, "time",
-                              &V8Console::call<&V8Console::timeCallback>);
-  createBoundFunctionProperty(context, console, data, "timeEnd",
-                              &V8Console::call<&V8Console::timeEndCallback>);
-  createBoundFunctionProperty(context, console, data, "timeStamp",
-                              &V8Console::call<&V8Console::timeStampCallback>);
-  return console;
-}
-
 void V8Console::installMemoryGetter(v8::Local<v8::Context> context,
                                     v8::Local<v8::Object> console) {
   v8::Isolate* isolate = context->GetIsolate();
   v8::Local<v8::External> data = v8::External::New(isolate, this);
   console->SetAccessorProperty(
       toV8StringInternalized(isolate, "memory"),
       v8::Function::New(context,
                         &V8Console::call<&V8Console::memoryGetterCallback>,
                         data, 0, v8::ConstructorBehavior::kThrow)
           .ToLocalChecked(),
@@ skipping 11 matching lines @@
                                       v8::MicrotasksScope::kDoNotRunMicrotasks);
 
   v8::Local<v8::Object> commandLineAPI = v8::Object::New(isolate);
   bool success =
       commandLineAPI->SetPrototype(context, v8::Null(isolate)).FromMaybe(false);
   DCHECK(success);
   USE(success);
 
   v8::Local<v8::External> data = v8::External::New(isolate, this);
   createBoundFunctionProperty(context, commandLineAPI, data, "dir",
-                              &V8Console::call<&V8Console::dirCallback>,
+                              &V8Console::call<&V8Console::Dir>,
                               "function dir(value) { [Command Line API] }");
   createBoundFunctionProperty(context, commandLineAPI, data, "dirxml",
-                              &V8Console::call<&V8Console::dirxmlCallback>,
+                              &V8Console::call<&V8Console::DirXml>,
                               "function dirxml(value) { [Command Line API] }");
   createBoundFunctionProperty(context, commandLineAPI, data, "profile",
-                              &V8Console::call<&V8Console::profileCallback>,
+                              &V8Console::call<&V8Console::Profile>,
                               "function profile(title) { [Command Line API] }");
   createBoundFunctionProperty(
       context, commandLineAPI, data, "profileEnd",
-      &V8Console::call<&V8Console::profileEndCallback>,
+      &V8Console::call<&V8Console::ProfileEnd>,
       "function profileEnd(title) { [Command Line API] }");
   createBoundFunctionProperty(context, commandLineAPI, data, "clear",
-                              &V8Console::call<&V8Console::clearCallback>,
+                              &V8Console::call<&V8Console::Clear>,
                               "function clear() { [Command Line API] }");
   createBoundFunctionProperty(
       context, commandLineAPI, data, "table",
-      &V8Console::call<&V8Console::tableCallback>,
+      &V8Console::call<&V8Console::Table>,
       "function table(data, [columns]) { [Command Line API] }");
 
   createBoundFunctionProperty(context, commandLineAPI, data, "keys",
                               &V8Console::call<&V8Console::keysCallback>,
                               "function keys(object) { [Command Line API] }");
   createBoundFunctionProperty(context, commandLineAPI, data, "values",
                               &V8Console::call<&V8Console::valuesCallback>,
                               "function values(object) { [Command Line API] }");
   createBoundFunctionProperty(
       context, commandLineAPI, data, "debug",
@@ skipping 133 matching lines @@
                          ->GetOwnPropertyDescriptor(
                              m_context, v8::Local<v8::String>::Cast(name))
                          .ToLocal(&descriptor);
       DCHECK(success);
       USE(success);
     }
   }
 }
 
 }  // namespace v8_inspector