[DevTools] ConsoleAPI messages pass through frame console

Source/core/inspector/ConsoleMessage.cpp

Index: Source/core/inspector/ConsoleMessage.cpp
diff --git a/Source/core/inspector/ConsoleMessage.cpp b/Source/core/inspector/ConsoleMessage.cpp
index f51cc826f2b98fb89ccb5806a5bc84cc7b9290df..f0ec155c3bd73472160fc9288585b9e52966105a 100644
--- a/Source/core/inspector/ConsoleMessage.cpp
+++ b/Source/core/inspector/ConsoleMessage.cpp
@@ -6,18 +6,10 @@
 #include "core/inspector/ConsoleMessage.h"
 
 #include "bindings/core/v8/ScriptState.h"
+#include "core/inspector/ScriptArguments.h"
 
 namespace blink {
 
-ConsoleMessage::ConsoleMessage()
-    : m_lineNumber(0)
-    , m_columnNumber(0)
-    , m_scriptState(nullptr)
-    , m_requestIdentifier(0)
-    , m_workerProxy(nullptr)
-{
-}
-
 ConsoleMessage::ConsoleMessage(MessageSource source,
     MessageLevel level,
     const String& message,
@@ -26,11 +18,11 @@ ConsoleMessage::ConsoleMessage(MessageSource source,
     unsigned columnNumber)
     : m_source(source)
     , m_level(level)
+    , m_type(LogMessageType)
     , m_message(message)
     , m_url(url)
     , m_lineNumber(lineNumber)
     , m_columnNumber(columnNumber)
-    , m_scriptState(nullptr)
     , m_requestIdentifier(0)
     , m_workerProxy(nullptr)
 {
@@ -40,54 +32,79 @@ ConsoleMessage::~ConsoleMessage()
 {
 }
 
-PassRefPtrWillBeRawPtr<ScriptCallStack> ConsoleMessage::callStack() const
+MessageType ConsoleMessage::type() const
 {
-    return m_callStack;
+    return m_type;
 }
 
-void ConsoleMessage::setCallStack(PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
+void ConsoleMessage::setType(MessageType type)
 {
-    m_callStack = callStack;
+    m_type = type;
 }
 
-ScriptState* ConsoleMessage::scriptState() const
+const String& ConsoleMessage::url() const
 {
-    return m_scriptState;
+    return m_url;
 }
 
-void ConsoleMessage::setScriptState(ScriptState* scriptState)
+void ConsoleMessage::setURL(const String& url)
 {
-    m_scriptState = scriptState;
+    m_url = url;
 }
 
-unsigned long ConsoleMessage::requestIdentifier() const
+unsigned ConsoleMessage::lineNumber() const
 {
-    return m_requestIdentifier;
+    return m_lineNumber;
 }
 
-void ConsoleMessage::setRequestIdentifier(unsigned long requestIdentifier)
+void ConsoleMessage::setLineNumber(unsigned lineNumber)
 {
-    m_requestIdentifier = requestIdentifier;
+    m_lineNumber = lineNumber;
 }
 
-const String& ConsoleMessage::url() const
+PassRefPtrWillBeRawPtr<ScriptCallStack> ConsoleMessage::callStack() const
 {
-    return m_url;
+    return m_callStack;
 }
 
-void ConsoleMessage::setURL(const String& url)
+void ConsoleMessage::setCallStack(PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
 {
-    m_url = url;
+    m_callStack = callStack;
 }
 
-unsigned ConsoleMessage::lineNumber() const
+ScriptState* ConsoleMessage::scriptState() const
 {
-    return m_lineNumber;
+    if (m_scriptState)
+        return m_scriptState->get();
+    return nullptr;
 }
 
-void ConsoleMessage::setLineNumber(unsigned lineNumber)
+void ConsoleMessage::setScriptState(ScriptState* scriptState)
 {
-    m_lineNumber = lineNumber;
+    if (scriptState)
+        m_scriptState = adoptPtr(new ScriptStateProtectingContext(scriptState));
+    else
+        m_scriptState.clear();
+}
+
+PassRefPtr<ScriptArguments> ConsoleMessage::scriptArguments() const
+{
+    return m_scriptArguments;
+}
+
+void ConsoleMessage::setScriptArguments(PassRefPtr<ScriptArguments> scriptArguments)
+{
+    m_scriptArguments = scriptArguments;
+}
+
+unsigned long ConsoleMessage::requestIdentifier() const
+{
+    return m_requestIdentifier;
+}
+
+void ConsoleMessage::setRequestIdentifier(unsigned long requestIdentifier)
+{
+    m_requestIdentifier = requestIdentifier;
 }
 
 MessageSource ConsoleMessage::source() const