Route JS Error Info From Blink to Chrome

Source/core/inspector/ConsoleMessage.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009, 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 33 matching lines @@
 #include "core/inspector/ScriptCallStack.h"
 #include "wtf/CurrentTime.h"
 
 namespace WebCore {
 
 ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
-    , m_url()
     , m_line(0)
     , m_column(0)
     , m_repeatCount(1)
     , m_requestId(IdentifiersFactory::requestId(0))
     , m_timestamp(WTF::currentTime())
 {
     autogenerateMetadata(canGenerateCallStack);
 }
 
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* state, unsigned long requestIdentifier)
+ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& executionContextURL, const String& url, unsigned line, unsigned column, ScriptState* state, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
+    , m_executionContextURL(executionContextURL)
     , m_url(url)
     , m_line(line)
     , m_column(column)
     , m_repeatCount(1)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
     autogenerateMetadata(canGenerateCallStack, state);
 }
 
-ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
+ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& executionContextURL, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
+    , m_executionContextURL(executionContextURL)
     , m_arguments(0)
     , m_line(0)
     , m_column(0)
     , m_repeatCount(1)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
     if (callStack && callStack->size()) {
         const ScriptCallFrame& frame = callStack->at(0);
         m_url = frame.sourceURL();
         m_line = frame.lineNumber();
         m_column = frame.columnNumber();
     }
     m_callStack = callStack;
 }
 
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, ScriptState* state, unsigned long requestIdentifier)
+ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& executionContextURL, PassRefPtr<ScriptArguments> arguments, ScriptState* state, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
     , m_message(message)
+    , m_executionContextURL(executionContextURL)
     , m_arguments(arguments)
-    , m_url()
     , m_line(0)
     , m_column(0)
     , m_repeatCount(1)
     , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
     , m_timestamp(WTF::currentTime())
 {
     autogenerateMetadata(canGenerateCallStack, state);
 }
 
 ConsoleMessage::~ConsoleMessage()
 {
 }
 
 void ConsoleMessage::autogenerateMetadata(bool canGenerateCallStack, ScriptState* state)
 {
     if (m_type == EndGroupMessageType)
         return;
 
-    if (state)
+    if (canGenerateCallStack)
+        generateCallStack(ScriptCallStack::maxCallStackSizeToCapture);
+    else if (state)
         m_callStack = createScriptCallStackForConsole(state);
-    else if (canGenerateCallStack)
-        m_callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture, true);
     else
         return;
 
     if (m_callStack && m_callStack->size()) {
         const ScriptCallFrame& frame = m_callStack->at(0);
         m_url = frame.sourceURL();
         m_line = frame.lineNumber();
         m_column = frame.columnNumber();
         return;
     }
 
     m_callStack.clear();
 }
 
+void ConsoleMessage::generateCallStack(size_t maxSizeToCapture)
+{
+    m_callStack = createScriptCallStack(maxSizeToCapture, true);
+}
+
 static TypeBuilder::Console::ConsoleMessage::Source::Enum messageSourceValue(MessageSource source)
 {
     switch (source) {
     case XMLMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Xml;
     case JSMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Javascript;
     case NetworkMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Network;
     case ConsoleAPIMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Console_api;
     case StorageMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Storage;
     case AppCacheMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Appcache;
     case RenderingMessageSource: return TypeBuilder::Console::ConsoleMessage::Source::Rendering;
@@ skipping 29 matching lines @@
 {
     switch (level) {
     case DebugMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Debug;
     case LogMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Log;
     case WarningMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Warning;
     case ErrorMessageLevel: return TypeBuilder::Console::ConsoleMessage::Level::Error;
     }
     return TypeBuilder::Console::ConsoleMessage::Level::Log;
 }
 
-void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager, bool generatePreview)
+PassRefPtr<TypeBuilder::Console::ConsoleMessage> ConsoleMessage::generateJSONWithoutArguments() const
 {
     RefPtr<TypeBuilder::Console::ConsoleMessage> jsonObj = TypeBuilder::Console::ConsoleMessage::create()
         .setSource(messageSourceValue(m_source))
         .setLevel(messageLevelValue(m_level))
         .setText(m_message)
         .setTimestamp(m_timestamp);
     // FIXME: only send out type for ConsoleAPI source messages.
     jsonObj->setType(messageTypeValue(m_type));
     jsonObj->setLine(static_cast<int>(m_line));
     jsonObj->setColumn(static_cast<int>(m_column));
     jsonObj->setUrl(m_url);
+    jsonObj->setExecutionContextURL(m_executionContextURL);
     jsonObj->setRepeatCount(static_cast<int>(m_repeatCount));
     if (m_source == NetworkMessageSource && !m_requestId.isEmpty())
         jsonObj->setNetworkRequestId(m_requestId);
+    if (m_callStack)
+        jsonObj->setStackTrace(m_callStack->buildInspectorArray());
+    return jsonObj;
+}
+
+void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager, bool generatePreview)
+{
+    RefPtr<TypeBuilder::Console::ConsoleMessage> jsonObj = generateJSONWithoutArguments();
     if (m_arguments && m_arguments->argumentCount()) {
         InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
         if (!injectedScript.hasNoValue()) {
             RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject> > jsonArgs = TypeBuilder::Array<TypeBuilder::Runtime::RemoteObject>::create();
             if (m_type == TableMessageType && generatePreview && m_arguments->argumentCount()) {
                 ScriptValue table = m_arguments->argumentAt(0);
                 ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : ScriptValue();
                 RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
                 if (!inspectorValue) {
                     ASSERT_NOT_REACHED();
                     return;
                 }
                 jsonArgs->addItem(inspectorValue);
             } else {
                 for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
                     RefPtr<TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
                     if (!inspectorValue) {
                         ASSERT_NOT_REACHED();
                         return;
                     }
                     jsonArgs->addItem(inspectorValue);
                 }
             }
             jsonObj->setParameters(jsonArgs);
         }
     }
-    if (m_callStack)
-        jsonObj->setStackTrace(m_callStack->buildInspectorArray());
     frontend->messageAdded(jsonObj);
 }
 
 void ConsoleMessage::incrementCount()
 {
     m_timestamp = WTF::currentTime();
     ++m_repeatCount;
 }
 
 void ConsoleMessage::updateRepeatCountInConsole(InspectorFrontend::Console* frontend)
@@ skipping 23 matching lines @@
     return msg->m_source == m_source
         && msg->m_type == m_type
         && msg->m_level == m_level
         && msg->m_message == m_message
         && msg->m_line == m_line
         && msg->m_column == m_column
         && msg->m_url == m_url
         && msg->m_requestId == m_requestId;
 }
 
+bool ConsoleMessage::hasGeneratedCallStack() const
+{
+    return m_callStack;
+}
+
 void ConsoleMessage::windowCleared(DOMWindow* window)
 {
     if (!m_arguments)
         return;
     if (m_arguments->globalState()->domWindow() != window)
         return;
     if (!m_message)
         m_message = "<message collected>";
     m_arguments.clear();
 }
 
 unsigned ConsoleMessage::argumentCount()
 {
     if (m_arguments)
         return m_arguments->argumentCount();
     return 0;
 }
 
 } // namespace WebCore