Revert of [inspector] console get all information from inspector when needed

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"
 #include "src/inspector/v8-console-message.h"
 #include "src/inspector/v8-debugger-agent-impl.h"
 #include "src/inspector/v8-inspector-impl.h"
 #include "src/inspector/v8-inspector-session-impl.h"
 #include "src/inspector/v8-profiler-agent-impl.h"
 #include "src/inspector/v8-runtime-agent-impl.h"
 #include "src/inspector/v8-stack-trace-impl.h"
 #include "src/inspector/v8-value-copier.h"
 
 #include "include/v8-inspector.h"
 
 namespace v8_inspector {
 
 namespace {
 
+v8::Local<v8::Private> inspectedContextPrivateKey(v8::Isolate* isolate) {
+  return v8::Private::ForApi(
+      isolate, toV8StringInternalized(isolate, "V8Console#InspectedContext"));
+}
+
 class ConsoleHelper {
  public:
   explicit ConsoleHelper(const v8::FunctionCallbackInfo<v8::Value>& info)
       : m_info(info),
         m_isolate(info.GetIsolate()),
         m_context(info.GetIsolate()->GetCurrentContext()),
-        m_contextId(InspectedContext::contextId(m_context)) {
-    m_inspector = static_cast<V8InspectorImpl*>(
-        m_info.Data().As<v8::External>()->Value());
-    m_groupId = m_inspector->contextGroupId(m_contextId);
+        m_inspectedContext(nullptr),
+        m_inspectorClient(nullptr) {}
+
+  v8::Local<v8::Object> ensureConsole() {
+    if (m_console.IsEmpty()) {
+      DCHECK(!m_info.Data().IsEmpty());
+      DCHECK(!m_info.Data()->IsUndefined());
+      m_console = m_info.Data().As<v8::Object>();
+    }
+    return m_console;
   }
 
-  V8InspectorImpl* inspector() { return m_inspector; }
+  InspectedContext* ensureInspectedContext() {
+    if (m_inspectedContext) return m_inspectedContext;
+    v8::Local<v8::Object> console = ensureConsole();
 
-  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;
-    return context->getInjectedScript();
+    v8::Local<v8::Private> key = inspectedContextPrivateKey(m_isolate);
+    v8::Local<v8::Value> inspectedContextValue;
+    if (!console->GetPrivate(m_context, key).ToLocal(&inspectedContextValue))
+      return nullptr;
+    DCHECK(inspectedContextValue->IsExternal());
+    m_inspectedContext = static_cast<InspectedContext*>(
+        inspectedContextValue.As<v8::External>()->Value());
+    return m_inspectedContext;
   }
 
-  V8ConsoleMessageStorage* consoleMessageStorage() {
-    return inspector()->ensureConsoleMessageStorage(m_groupId);
+  V8InspectorClient* ensureDebuggerClient() {
+    if (m_inspectorClient) return m_inspectorClient;
+    InspectedContext* inspectedContext = ensureInspectedContext();
+    if (!inspectedContext) return nullptr;
+    m_inspectorClient = inspectedContext->inspector()->client();
+    return m_inspectorClient;
   }
 
   void reportCall(ConsoleAPIType type) {
     if (!m_info.Length()) return;
     std::vector<v8::Local<v8::Value>> arguments;
     for (int i = 0; i < m_info.Length(); ++i) arguments.push_back(m_info[i]);
     reportCall(type, arguments);
   }
 
   void reportCallWithDefaultArgument(ConsoleAPIType type,
                                      const String16& message) {
     std::vector<v8::Local<v8::Value>> arguments;
     for (int i = 0; i < m_info.Length(); ++i) arguments.push_back(m_info[i]);
     if (!m_info.Length()) arguments.push_back(toV8String(m_isolate, message));
     reportCall(type, arguments);
   }
 
   void reportCallWithArgument(ConsoleAPIType type, const String16& message) {
     std::vector<v8::Local<v8::Value>> arguments(1,
                                                 toV8String(m_isolate, message));
     reportCall(type, arguments);
   }
 
   void reportCall(ConsoleAPIType type,
                   const std::vector<v8::Local<v8::Value>>& arguments) {
+    InspectedContext* inspectedContext = ensureInspectedContext();
+    if (!inspectedContext) return;
+    int contextGroupId = inspectedContext->contextGroupId();
+    V8InspectorImpl* inspector = inspectedContext->inspector();
     std::unique_ptr<V8ConsoleMessage> message =
         V8ConsoleMessage::createForConsoleAPI(
-            m_context, m_contextId, m_groupId, m_inspector,
-            m_inspector->client()->currentTimeMS(), type, arguments,
-            m_inspector->debugger()->captureStackTrace(false));
-    consoleMessageStorage()->addMessage(std::move(message));
+            inspector->client()->currentTimeMS(), type, arguments,
+            inspector->debugger()->captureStackTrace(false), inspectedContext);
+    inspector->ensureConsoleMessageStorage(contextGroupId)
+        ->addMessage(std::move(message));
   }
 
   void reportDeprecatedCall(const char* id, const String16& message) {
-    if (!consoleMessageStorage()->shouldReportDeprecationMessage(m_contextId,
-                                                                 id)) {
-      return;
-    }
+    if (checkAndSetPrivateFlagOnConsole(id, false)) return;
     std::vector<v8::Local<v8::Value>> arguments(1,
                                                 toV8String(m_isolate, message));
     reportCall(ConsoleAPIType::kWarning, arguments);
   }
 
   bool firstArgToBoolean(bool defaultValue) {
     if (m_info.Length() < 1) return defaultValue;
     if (m_info[0]->IsBoolean()) return m_info[0].As<v8::Boolean>()->Value();
     return m_info[0]->BooleanValue(m_context).FromMaybe(defaultValue);
   }
@@ skipping 20 matching lines @@
 
   v8::MaybeLocal<v8::Function> firstArgAsFunction() {
     if (m_info.Length() < 1 || !m_info[0]->IsFunction())
       return v8::MaybeLocal<v8::Function>();
     v8::Local<v8::Function> func = m_info[0].As<v8::Function>();
     while (func->GetBoundFunction()->IsFunction())
       func = func->GetBoundFunction().As<v8::Function>();
     return func;
   }
 
+  v8::MaybeLocal<v8::Map> privateMap(const char* name) {
+    v8::Local<v8::Object> console = ensureConsole();
+    v8::Local<v8::Private> privateKey =
+        v8::Private::ForApi(m_isolate, toV8StringInternalized(m_isolate, name));
+    v8::Local<v8::Value> mapValue;
+    if (!console->GetPrivate(m_context, privateKey).ToLocal(&mapValue))
+      return v8::MaybeLocal<v8::Map>();
+    if (mapValue->IsUndefined()) {
+      v8::Local<v8::Map> map = v8::Map::New(m_isolate);
+      if (!console->SetPrivate(m_context, privateKey, map).FromMaybe(false))
+        return v8::MaybeLocal<v8::Map>();
+      return map;
+    }
+    return mapValue->IsMap() ? mapValue.As<v8::Map>()
+                             : v8::MaybeLocal<v8::Map>();
+  }
+
+  int32_t getIntFromMap(v8::Local<v8::Map> map, const String16& key,
+                        int32_t defaultValue) {
+    v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
+    if (!map->Has(m_context, v8Key).FromMaybe(false)) return defaultValue;
+    v8::Local<v8::Value> intValue;
+    if (!map->Get(m_context, v8Key).ToLocal(&intValue)) return defaultValue;
+    return static_cast<int32_t>(intValue.As<v8::Integer>()->Value());
+  }
+
+  void setIntOnMap(v8::Local<v8::Map> map, const String16& key, int32_t value) {
+    v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
+    if (!map->Set(m_context, v8Key, v8::Integer::New(m_isolate, value))
+             .ToLocal(&map))
+      return;
+  }
+
+  double getDoubleFromMap(v8::Local<v8::Map> map, const String16& key,
+                          double defaultValue) {
+    v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
+    if (!map->Has(m_context, v8Key).FromMaybe(false)) return defaultValue;
+    v8::Local<v8::Value> intValue;
+    if (!map->Get(m_context, v8Key).ToLocal(&intValue)) return defaultValue;
+    return intValue.As<v8::Number>()->Value();
+  }
+
+  void setDoubleOnMap(v8::Local<v8::Map> map, const String16& key,
+                      double value) {
+    v8::Local<v8::String> v8Key = toV8String(m_isolate, key);
+    if (!map->Set(m_context, v8Key, v8::Number::New(m_isolate, value))
+             .ToLocal(&map))
+      return;
+  }
+
   V8ProfilerAgentImpl* profilerAgent() {
     if (V8InspectorSessionImpl* session = currentSession()) {
       if (session && session->profilerAgent()->enabled())
         return session->profilerAgent();
     }
     return nullptr;
   }
 
   V8DebuggerAgentImpl* debuggerAgent() {
     if (V8InspectorSessionImpl* session = currentSession()) {
       if (session && session->debuggerAgent()->enabled())
         return session->debuggerAgent();
     }
     return nullptr;
   }
 
   V8InspectorSessionImpl* currentSession() {
-    return m_inspector->sessionForContextGroup(m_groupId);
+    InspectedContext* inspectedContext = ensureInspectedContext();
+    if (!inspectedContext) return nullptr;
+    return inspectedContext->inspector()->sessionForContextGroup(
+        inspectedContext->contextGroupId());
   }
 
  private:
   const v8::FunctionCallbackInfo<v8::Value>& m_info;
   v8::Isolate* m_isolate;
   v8::Local<v8::Context> m_context;
   v8::Local<v8::Object> m_console;
-  V8InspectorImpl* m_inspector = nullptr;
-  int m_contextId;
-  int m_groupId;
+  InspectedContext* m_inspectedContext;
+  V8InspectorClient* m_inspectorClient;
+
+  bool checkAndSetPrivateFlagOnConsole(const char* name, bool defaultValue) {
+    v8::Local<v8::Object> console = ensureConsole();
+    v8::Local<v8::Private> key =
+        v8::Private::ForApi(m_isolate, toV8StringInternalized(m_isolate, name));
+    v8::Local<v8::Value> flagValue;
+    if (!console->GetPrivate(m_context, key).ToLocal(&flagValue))
+      return defaultValue;
+    DCHECK(flagValue->IsUndefined() || flagValue->IsBoolean());
+    if (flagValue->IsBoolean()) {
+      DCHECK(flagValue.As<v8::Boolean>()->Value());
+      return true;
+    }
+    if (!console->SetPrivate(m_context, key, v8::True(m_isolate))
+             .FromMaybe(false))
+      return defaultValue;
+    return false;
+  }
 
   DISALLOW_COPY_AND_ASSIGN(ConsoleHelper);
 };
 
 void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
   info.GetReturnValue().Set(info.Data());
 }
 
 void createBoundFunctionProperty(v8::Local<v8::Context> context,
                                  v8::Local<v8::Object> console,
-                                 v8::Local<v8::Value> data, const char* name,
+                                 const char* name,
                                  v8::FunctionCallback callback,
                                  const char* description = nullptr) {
   v8::Local<v8::String> funcName =
       toV8StringInternalized(context->GetIsolate(), name);
   v8::Local<v8::Function> func;
-  if (!v8::Function::New(context, callback, data, 0,
+  if (!v8::Function::New(context, callback, console, 0,
                          v8::ConstructorBehavior::kThrow)
            .ToLocal(&func))
     return;
   func->SetName(funcName);
   if (description) {
     v8::Local<v8::String> returnValue =
         toV8String(context->GetIsolate(), description);
     v8::Local<v8::Function> toStringFunction;
     if (v8::Function::New(context, returnDataCallback, returnValue, 0,
                           v8::ConstructorBehavior::kThrow)
@@ skipping 57 matching lines @@
 }
 
 void V8Console::groupEndCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info).reportCallWithDefaultArgument(
       ConsoleAPIType::kEndGroup, String16("console.groupEnd"));
 }
 
 void V8Console::clearCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
-  helper.inspector()->client()->consoleClear(helper.groupId());
+  InspectedContext* context = helper.ensureInspectedContext();
+  if (!context) return;
+  int contextGroupId = context->contextGroupId();
+  if (V8InspectorClient* client = helper.ensureDebuggerClient())
+    client->consoleClear(contextGroupId);
   helper.reportCallWithDefaultArgument(ConsoleAPIType::kClear,
                                        String16("console.clear"));
 }
 
 void V8Console::countCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
+
   String16 title = helper.firstArgToString(String16());
   String16 identifier;
   if (title.isEmpty()) {
     std::unique_ptr<V8StackTraceImpl> stackTrace =
         V8StackTraceImpl::capture(nullptr, 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);
+  v8::Local<v8::Map> countMap;
+  if (!helper.privateMap("V8Console#countMap").ToLocal(&countMap)) return;
+  int32_t count = helper.getIntFromMap(countMap, identifier, 0) + 1;
+  helper.setIntOnMap(countMap, identifier, count);
   String16 countString = String16::fromInteger(count);
   helper.reportCallWithArgument(
       ConsoleAPIType::kCount,
       title.isEmpty() ? countString : (title + ": " + countString));
 }
 
 void V8Console::assertCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
   if (helper.firstArgToBoolean(false)) return;
@@ skipping 29 matching lines @@
 void V8Console::profileEndCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
   if (V8ProfilerAgentImpl* profilerAgent = helper.profilerAgent())
     profilerAgent->consoleProfileEnd(helper.firstArgToString(String16()));
 }
 
 static void timeFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
                          bool timelinePrefix) {
   ConsoleHelper helper(info);
-  V8InspectorClient* client = helper.inspector()->client();
-  String16 protocolTitle = helper.firstArgToString("default");
-  if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
-  client->consoleTime(toStringView(protocolTitle));
-  helper.consoleMessageStorage()->time(helper.contextId(), protocolTitle);
+  if (V8InspectorClient* client = helper.ensureDebuggerClient()) {
+    String16 protocolTitle = helper.firstArgToString("default");
+    if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
+    client->consoleTime(toStringView(protocolTitle));
+
+    v8::Local<v8::Map> timeMap;
+    if (!helper.privateMap("V8Console#timeMap").ToLocal(&timeMap)) return;
+    helper.setDoubleOnMap(timeMap, protocolTitle, client->currentTimeMS());
+  }
 }
 
 static void timeEndFunction(const v8::FunctionCallbackInfo<v8::Value>& info,
                             bool timelinePrefix) {
   ConsoleHelper helper(info);
-  V8InspectorClient* client = helper.inspector()->client();
-  String16 protocolTitle = helper.firstArgToString("default");
-  if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
-  client->consoleTimeEnd(toStringView(protocolTitle));
-  double elapsed = helper.consoleMessageStorage()->timeEnd(helper.contextId(),
-                                                           protocolTitle);
-  String16 message =
-      protocolTitle + ": " + String16::fromDouble(elapsed) + "ms";
-  helper.reportCallWithArgument(ConsoleAPIType::kTimeEnd, message);
+  if (V8InspectorClient* client = helper.ensureDebuggerClient()) {
+    String16 protocolTitle = helper.firstArgToString("default");
+    if (timelinePrefix) protocolTitle = "Timeline '" + protocolTitle + "'";
+    client->consoleTimeEnd(toStringView(protocolTitle));
+
+    v8::Local<v8::Map> timeMap;
+    if (!helper.privateMap("V8Console#timeMap").ToLocal(&timeMap)) return;
+    double elapsed = client->currentTimeMS() -
+                     helper.getDoubleFromMap(timeMap, protocolTitle, 0.0);
+    String16 message =
+        protocolTitle + ": " + String16::fromDouble(elapsed) + "ms";
+    helper.reportCallWithArgument(ConsoleAPIType::kTimeEnd, message);
+  }
 }
 
 void V8Console::timelineCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper(info).reportDeprecatedCall(
       "V8Console#timeline",
       "'console.timeline' is deprecated. Please use 'console.time' instead.");
   timeFunction(info, true);
 }
 
@@ skipping 11 matching lines @@
 }
 
 void V8Console::timeEndCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   timeEndFunction(info, false);
 }
 
 void V8Console::timeStampCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
-  String16 title = helper.firstArgToString(String16());
-  helper.inspector()->client()->consoleTimeStamp(toStringView(title));
+  if (V8InspectorClient* client = helper.ensureDebuggerClient()) {
+    String16 title = helper.firstArgToString(String16());
+    client->consoleTimeStamp(toStringView(title));
+  }
 }
 
 void V8Console::memoryGetterCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
-  V8InspectorClient* client = ConsoleHelper(info).inspector()->client();
-  v8::Local<v8::Value> memoryValue;
-  if (!client
-           ->memoryInfo(info.GetIsolate(),
-                        info.GetIsolate()->GetCurrentContext())
-           .ToLocal(&memoryValue))
-    return;
-  info.GetReturnValue().Set(memoryValue);
+  if (V8InspectorClient* client = ConsoleHelper(info).ensureDebuggerClient()) {
+    v8::Local<v8::Value> memoryValue;
+    if (!client
+             ->memoryInfo(info.GetIsolate(),
+                          info.GetIsolate()->GetCurrentContext())
+             .ToLocal(&memoryValue))
+      return;
+    info.GetReturnValue().Set(memoryValue);
+  }
 }
 
 void V8Console::memorySetterCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   // We can't make the attribute readonly as it breaks existing code that relies
   // on being able to assign to console.memory in strict mode. Instead, the
   // setter just ignores the passed value.  http://crbug.com/468611
 }
 
 void V8Console::keysCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
@@ skipping 100 matching lines @@
   v8::Local<v8::Function> function;
   if (!helper.firstArgAsFunction().ToLocal(&function)) return;
   setFunctionBreakpoint(helper, function,
                         V8DebuggerAgentImpl::MonitorCommandBreakpointSource,
                         String16(), false);
 }
 
 void V8Console::lastEvaluationResultCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   ConsoleHelper helper(info);
-  InjectedScript* injectedScript = helper.injectedScript();
-  if (!injectedScript) return;
-  info.GetReturnValue().Set(injectedScript->lastEvaluationResult());
+  InspectedContext* context = helper.ensureInspectedContext();
+  if (!context) return;
+  if (InjectedScript* injectedScript = context->getInjectedScript())
+    info.GetReturnValue().Set(injectedScript->lastEvaluationResult());
 }
 
 static void inspectImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
                         bool copyToClipboard) {
   if (info.Length() < 1) return;
   if (!copyToClipboard) info.GetReturnValue().Set(info[0]);
 
   ConsoleHelper helper(info);
-  InjectedScript* injectedScript = helper.injectedScript();
+  InspectedContext* context = helper.ensureInspectedContext();
+  if (!context) return;
+  InjectedScript* injectedScript = context->getInjectedScript();
   if (!injectedScript) return;
   std::unique_ptr<protocol::Runtime::RemoteObject> wrappedObject;
   protocol::Response response =
       injectedScript->wrapObject(info[0], "", false /** forceValueType */,
                                  false /** generatePreview */, &wrappedObject);
   if (!response.isSuccess()) return;
 
   std::unique_ptr<protocol::DictionaryValue> hints =
       protocol::DictionaryValue::create();
   if (copyToClipboard) hints->setBoolean("copyToClipboard", true);
-  if (V8InspectorSessionImpl* session = helper.currentSession()) {
+  if (V8InspectorSessionImpl* session = helper.currentSession())
     session->runtimeAgent()->inspect(std::move(wrappedObject),
                                      std::move(hints));
-  }
 }
 
 void V8Console::inspectCallback(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   inspectImpl(info, false);
 }
 
 void V8Console::copyCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
   inspectImpl(info, true);
 }
@@ skipping 19 matching lines @@
   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, inspectedContext->inspector());
-  createBoundFunctionProperty(context, console, data, "debug",
+  createBoundFunctionProperty(context, console, "debug",
                               V8Console::debugCallback);
-  createBoundFunctionProperty(context, console, data, "error",
+  createBoundFunctionProperty(context, console, "error",
                               V8Console::errorCallback);
-  createBoundFunctionProperty(context, console, data, "info",
+  createBoundFunctionProperty(context, console, "info",
                               V8Console::infoCallback);
-  createBoundFunctionProperty(context, console, data, "log",
-                              V8Console::logCallback);
-  createBoundFunctionProperty(context, console, data, "warn",
+  createBoundFunctionProperty(context, console, "log", V8Console::logCallback);
+  createBoundFunctionProperty(context, console, "warn",
                               V8Console::warnCallback);
-  createBoundFunctionProperty(context, console, data, "dir",
-                              V8Console::dirCallback);
-  createBoundFunctionProperty(context, console, data, "dirxml",
+  createBoundFunctionProperty(context, console, "dir", V8Console::dirCallback);
+  createBoundFunctionProperty(context, console, "dirxml",
                               V8Console::dirxmlCallback);
-  createBoundFunctionProperty(context, console, data, "table",
+  createBoundFunctionProperty(context, console, "table",
                               V8Console::tableCallback);
-  createBoundFunctionProperty(context, console, data, "trace",
+  createBoundFunctionProperty(context, console, "trace",
                               V8Console::traceCallback);
-  createBoundFunctionProperty(context, console, data, "group",
+  createBoundFunctionProperty(context, console, "group",
                               V8Console::groupCallback);
-  createBoundFunctionProperty(context, console, data, "groupCollapsed",
+  createBoundFunctionProperty(context, console, "groupCollapsed",
                               V8Console::groupCollapsedCallback);
-  createBoundFunctionProperty(context, console, data, "groupEnd",
+  createBoundFunctionProperty(context, console, "groupEnd",
                               V8Console::groupEndCallback);
-  createBoundFunctionProperty(context, console, data, "clear",
+  createBoundFunctionProperty(context, console, "clear",
                               V8Console::clearCallback);
-  createBoundFunctionProperty(context, console, data, "count",
+  createBoundFunctionProperty(context, console, "count",
                               V8Console::countCallback);
-  createBoundFunctionProperty(context, console, data, "assert",
+  createBoundFunctionProperty(context, console, "assert",
                               V8Console::assertCallback);
-  createBoundFunctionProperty(context, console, data, "markTimeline",
+  createBoundFunctionProperty(context, console, "markTimeline",
                               V8Console::markTimelineCallback);
-  createBoundFunctionProperty(context, console, data, "profile",
+  createBoundFunctionProperty(context, console, "profile",
                               V8Console::profileCallback);
-  createBoundFunctionProperty(context, console, data, "profileEnd",
+  createBoundFunctionProperty(context, console, "profileEnd",
                               V8Console::profileEndCallback);
-  createBoundFunctionProperty(context, console, data, "timeline",
+  createBoundFunctionProperty(context, console, "timeline",
                               V8Console::timelineCallback);
-  createBoundFunctionProperty(context, console, data, "timelineEnd",
+  createBoundFunctionProperty(context, console, "timelineEnd",
                               V8Console::timelineEndCallback);
-  createBoundFunctionProperty(context, console, data, "time",
+  createBoundFunctionProperty(context, console, "time",
                               V8Console::timeCallback);
-  createBoundFunctionProperty(context, console, data, "timeEnd",
+  createBoundFunctionProperty(context, console, "timeEnd",
                               V8Console::timeEndCallback);
-  createBoundFunctionProperty(context, console, data, "timeStamp",
+  createBoundFunctionProperty(context, console, "timeStamp",
                               V8Console::timeStampCallback);
 
   const char* jsConsoleAssert =
       "(function(){\n"
       "  var originAssert = this.assert;\n"
       "  originAssert.apply = Function.prototype.apply;\n"
       "  this.assert = assertWrapper;\n"
       "  assertWrapper.toString = () => originAssert.toString();\n"
       "  function assertWrapper(){\n"
       "    if (!!arguments[0]) return;\n"
       "    originAssert.apply(null, arguments);\n"
       "  }\n"
       "})";
 
   v8::Local<v8::String> assertSource = toV8String(isolate, jsConsoleAssert);
   V8InspectorImpl* inspector = inspectedContext->inspector();
   v8::Local<v8::Value> setupFunction;
   if (inspector->compileAndRunInternalScript(context, assertSource)
           .ToLocal(&setupFunction) &&
       setupFunction->IsFunction()) {
     v8::MicrotasksScope microtasksScope(
         isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
     v8::MaybeLocal<v8::Value> result;
     result = v8::Local<v8::Function>::Cast(setupFunction)
                  ->Call(context, console, 0, nullptr);
   }
 
-  if (hasMemoryAttribute) {
+  if (hasMemoryAttribute)
     console->SetAccessorProperty(
         toV8StringInternalized(isolate, "memory"),
-        v8::Function::New(context, V8Console::memoryGetterCallback, data, 0,
+        v8::Function::New(context, V8Console::memoryGetterCallback, console, 0,
                           v8::ConstructorBehavior::kThrow)
             .ToLocalChecked(),
-        v8::Function::New(context, V8Console::memorySetterCallback, data, 0,
+        v8::Function::New(context, V8Console::memorySetterCallback,
+                          v8::Local<v8::Value>(), 0,
                           v8::ConstructorBehavior::kThrow)
             .ToLocalChecked(),
         static_cast<v8::PropertyAttribute>(v8::None), v8::DEFAULT);
-  }
 
+  console->SetPrivate(context, inspectedContextPrivateKey(isolate),
+                      v8::External::New(isolate, inspectedContext));
   return console;
 }
 
+void V8Console::clearInspectedContextIfNeeded(v8::Local<v8::Context> context,
+                                              v8::Local<v8::Object> console) {
+  v8::Isolate* isolate = context->GetIsolate();
+  console->SetPrivate(context, inspectedContextPrivateKey(isolate),
+                      v8::External::New(isolate, nullptr));
+}
+
 v8::Local<v8::Object> V8Console::createCommandLineAPI(
     InspectedContext* inspectedContext) {
   v8::Local<v8::Context> context = inspectedContext->context();
   v8::Isolate* isolate = context->GetIsolate();
   v8::MicrotasksScope microtasksScope(isolate,
                                       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, inspectedContext->inspector());
-  createBoundFunctionProperty(context, commandLineAPI, data, "dir",
+  createBoundFunctionProperty(context, commandLineAPI, "dir",
                               V8Console::dirCallback,
                               "function dir(value) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "dirxml",
+  createBoundFunctionProperty(context, commandLineAPI, "dirxml",
                               V8Console::dirxmlCallback,
                               "function dirxml(value) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "profile",
+  createBoundFunctionProperty(context, commandLineAPI, "profile",
                               V8Console::profileCallback,
                               "function profile(title) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "profileEnd",
-      V8Console::profileEndCallback,
+      context, commandLineAPI, "profileEnd", V8Console::profileEndCallback,
       "function profileEnd(title) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "clear",
+  createBoundFunctionProperty(context, commandLineAPI, "clear",
                               V8Console::clearCallback,
                               "function clear() { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "table", V8Console::tableCallback,
+      context, commandLineAPI, "table", V8Console::tableCallback,
       "function table(data, [columns]) { [Command Line API] }");
 
-  createBoundFunctionProperty(context, commandLineAPI, data, "keys",
+  createBoundFunctionProperty(context, commandLineAPI, "keys",
                               V8Console::keysCallback,
                               "function keys(object) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "values",
+  createBoundFunctionProperty(context, commandLineAPI, "values",
                               V8Console::valuesCallback,
                               "function values(object) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "debug", V8Console::debugFunctionCallback,
+      context, commandLineAPI, "debug", V8Console::debugFunctionCallback,
       "function debug(function) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "undebug",
-      V8Console::undebugFunctionCallback,
+      context, commandLineAPI, "undebug", V8Console::undebugFunctionCallback,
       "function undebug(function) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "monitor",
-      V8Console::monitorFunctionCallback,
+      context, commandLineAPI, "monitor", V8Console::monitorFunctionCallback,
       "function monitor(function) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "unmonitor",
+      context, commandLineAPI, "unmonitor",
       V8Console::unmonitorFunctionCallback,
       "function unmonitor(function) { [Command Line API] }");
   createBoundFunctionProperty(
-      context, commandLineAPI, data, "inspect", V8Console::inspectCallback,
+      context, commandLineAPI, "inspect", V8Console::inspectCallback,
       "function inspect(object) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "copy",
+  createBoundFunctionProperty(context, commandLineAPI, "copy",
                               V8Console::copyCallback,
                               "function copy(value) { [Command Line API] }");
-  createBoundFunctionProperty(context, commandLineAPI, data, "$_",
+  createBoundFunctionProperty(context, commandLineAPI, "$_",
                               V8Console::lastEvaluationResultCallback);
-  createBoundFunctionProperty(context, commandLineAPI, data, "$0",
+  createBoundFunctionProperty(context, commandLineAPI, "$0",
                               V8Console::inspectedObject0);
-  createBoundFunctionProperty(context, commandLineAPI, data, "$1",
+  createBoundFunctionProperty(context, commandLineAPI, "$1",
                               V8Console::inspectedObject1);
-  createBoundFunctionProperty(context, commandLineAPI, data, "$2",
+  createBoundFunctionProperty(context, commandLineAPI, "$2",
                               V8Console::inspectedObject2);
-  createBoundFunctionProperty(context, commandLineAPI, data, "$3",
+  createBoundFunctionProperty(context, commandLineAPI, "$3",
                               V8Console::inspectedObject3);
-  createBoundFunctionProperty(context, commandLineAPI, data, "$4",
+  createBoundFunctionProperty(context, commandLineAPI, "$4",
                               V8Console::inspectedObject4);
 
   inspectedContext->inspector()->client()->installAdditionalCommandLineAPI(
       context, commandLineAPI);
+
+  commandLineAPI->SetPrivate(context, inspectedContextPrivateKey(isolate),
+                             v8::External::New(isolate, inspectedContext));
   return commandLineAPI;
 }
 
 static bool isCommandLineAPIGetter(const String16& name) {
   if (name.length() != 2) return false;
   // $0 ... $4, $_
   return name[0] == '$' &&
          ((name[1] >= '0' && name[1] <= '4') || name[1] == '_');
 }
 
@@ skipping 86 matching lines @@
                          ->GetOwnPropertyDescriptor(
                              m_context, v8::Local<v8::String>::Cast(name))
                          .ToLocal(&descriptor);
       DCHECK(success);
       USE(success);
     }
   }
 }
 
 }  // namespace v8_inspector