[DevTools] Handle navigation in console.log

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

Index: third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp
index 2a6f904ad8ee4f07cd8b0ef3c588a65361f76cc7..4fad148cc61cfea1eba7d10f3f08de9f47a8efcd 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8ConsoleMessage.cpp
@@ -330,6 +330,11 @@ ConsoleAPIType V8ConsoleMessage::type() const
 // static
 std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double timestamp, ConsoleAPIType type, const std::vector<v8::Local<v8::Value>>& arguments, std::unique_ptr<V8StackTraceImpl> stackTrace, InspectedContext* context)
 {
+    v8::Isolate* isolate = context->isolate();
+    int contextId = context->contextId();
+    int contextGroupId = context->contextGroupId();
+    V8InspectorImpl* inspector = context->inspector();
+
     std::unique_ptr<V8ConsoleMessage> message = wrapUnique(new V8ConsoleMessage(V8MessageOrigin::kConsole, timestamp, String16()));
     if (stackTrace && !stackTrace->isEmpty()) {
         message->m_url = toString16(stackTrace->topSourceURL());
@@ -338,11 +343,11 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double t
     }
     message->m_stackTrace = std::move(stackTrace);
     message->m_type = type;
-    message->m_contextId = context->contextId();
+    message->m_contextId = contextId;
     for (size_t i = 0; i < arguments.size(); ++i)
-        message->m_arguments.push_back(wrapUnique(new v8::Global<v8::Value>(context->isolate(), arguments.at(i))));
+        message->m_arguments.push_back(wrapUnique(new v8::Global<v8::Value>(isolate, arguments.at(i))));
     if (arguments.size())
-        message->m_message = V8ValueStringBuilder::toString(arguments[0], context->isolate());
+        message->m_message = V8ValueStringBuilder::toString(arguments[0], isolate);
 
     V8ConsoleAPIType clientType = V8ConsoleAPIType::kLog;
     if (type == ConsoleAPIType::kDebug || type == ConsoleAPIType::kCount || type == ConsoleAPIType::kTimeEnd)
@@ -355,7 +360,7 @@ std::unique_ptr<V8ConsoleMessage> V8ConsoleMessage::createForConsoleAPI(double t
         clientType = V8ConsoleAPIType::kInfo;
     else if (type == ConsoleAPIType::kClear)
         clientType = V8ConsoleAPIType::kClear;
-    context->inspector()->client()->consoleAPIMessage(context->contextGroupId(), clientType, toStringView(message->m_message), toStringView(message->m_url), message->m_lineNumber, message->m_columnNumber, message->m_stackTrace.get());
+    inspector->client()->consoleAPIMessage(contextGroupId, clientType, toStringView(message->m_message), toStringView(message->m_url), message->m_lineNumber, message->m_columnNumber, message->m_stackTrace.get());
 
     return message;
 }
@@ -409,15 +414,19 @@ V8ConsoleMessageStorage::~V8ConsoleMessageStorage()
 
 void V8ConsoleMessageStorage::addMessage(std::unique_ptr<V8ConsoleMessage> message)
 {
+    int contextGroupId = m_contextGroupId;
+    V8InspectorImpl* inspector = m_inspector;
     if (message->type() == ConsoleAPIType::kClear)
         clear();
 
-    V8InspectorSessionImpl* session = m_inspector->sessionForContextGroup(m_contextGroupId);
+    V8InspectorSessionImpl* session = inspector->sessionForContextGroup(contextGroupId);
     if (session) {
         if (message->origin() == V8MessageOrigin::kConsole)
             session->consoleAgent()->messageAdded(message.get());
         session->runtimeAgent()->messageAdded(message.get());
     }
+    if (!inspector->hasConsoleMessageStorage(contextGroupId))
+        return;
 
     DCHECK(m_messages.size() <= maxConsoleMessageCount);
     if (m_messages.size() == maxConsoleMessageCount) {