DevTools: Make FrameConsole methods accept ConsoleMessage objects.

Source/core/inspector/InspectorConsoleMessage.cpp

Index: Source/core/inspector/InspectorConsoleMessage.cpp
diff --git a/Source/core/inspector/ConsoleMessage.cpp b/Source/core/inspector/InspectorConsoleMessage.cpp
similarity index 86%
copy from Source/core/inspector/ConsoleMessage.cpp
copy to Source/core/inspector/InspectorConsoleMessage.cpp
index a92ac9fd3be9f54c3cbe5a1e7f40c1e183254a65..b5eb21d13b5eece6fa4e796c9e4f0db917f7f04a 100644
--- a/Source/core/inspector/ConsoleMessage.cpp
+++ b/Source/core/inspector/InspectorConsoleMessage.cpp
@@ -28,10 +28,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
-
 
-#include "core/inspector/ConsoleMessage.h"
+#include "config.h"
+#include "core/inspector/InspectorConsoleMessage.h"
 
 #include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "bindings/core/v8/ScriptValue.h"
@@ -47,7 +46,7 @@
 
 namespace WebCore {
 
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message)
+InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message)
     : m_source(source)
     , m_type(type)
     , m_level(level)
@@ -62,7 +61,7 @@ ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source,
     autogenerateMetadata(canGenerateCallStack);
 }
 
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* scriptState, unsigned long requestIdentifier)
+InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& url, unsigned line, unsigned column, ScriptState* scriptState, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
@@ -77,7 +76,7 @@ ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source,
     autogenerateMetadata(canGenerateCallStack, scriptState);
 }
 
-ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
+InspectorConsoleMessage::InspectorConsoleMessage(bool, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
@@ -98,7 +97,7 @@ ConsoleMessage::ConsoleMessage(bool, MessageSource source, MessageType type, Mes
     m_callStack = callStack;
 }
 
-ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, ScriptState* scriptState, unsigned long requestIdentifier)
+InspectorConsoleMessage::InspectorConsoleMessage(bool canGenerateCallStack, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, ScriptState* scriptState, unsigned long requestIdentifier)
     : m_source(source)
     , m_type(type)
     , m_level(level)
@@ -114,11 +113,11 @@ ConsoleMessage::ConsoleMessage(bool canGenerateCallStack, MessageSource source,
     autogenerateMetadata(canGenerateCallStack, scriptState);
 }
 
-ConsoleMessage::~ConsoleMessage()
+InspectorConsoleMessage::~InspectorConsoleMessage()
 {
 }
 
-void ConsoleMessage::autogenerateMetadata(bool canGenerateCallStack, ScriptState* scriptState)
+void InspectorConsoleMessage::autogenerateMetadata(bool canGenerateCallStack, ScriptState* scriptState)
 {
     if (m_type == EndGroupMessageType)
         return;
@@ -188,7 +187,7 @@ static TypeBuilder::Console::ConsoleMessage::Level::Enum messageLevelValue(Messa
     return TypeBuilder::Console::ConsoleMessage::Level::Log;
 }
 
-void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager, bool generatePreview)
+void InspectorConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, InjectedScriptManager* injectedScriptManager, bool generatePreview)
 {
     RefPtr<TypeBuilder::Console::ConsoleMessage> jsonObj = TypeBuilder::Console::ConsoleMessage::create()
         .setSource(messageSourceValue(m_source))
@@ -201,7 +200,7 @@ void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, Injecte
     jsonObj->setColumn(static_cast<int>(m_column));
     jsonObj->setUrl(m_url);
     ScriptState* scriptState = m_scriptState.get();
-    if (scriptState)
+    if (scriptState && scriptState->executionContext()->isDocument())
         jsonObj->setExecutionContextId(injectedScriptManager->injectedScriptIdFor(scriptState));
     if (m_source == NetworkMessageSource && !m_requestId.isEmpty())
         jsonObj->setNetworkRequestId(m_requestId);
@@ -239,12 +238,12 @@ void ConsoleMessage::addToFrontend(InspectorFrontend::Console* frontend, Injecte
     frontend->flush();
 }
 
-void ConsoleMessage::setAsyncStackTrace(PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> asyncCallStack)
+void InspectorConsoleMessage::setAsyncStackTrace(PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> asyncCallStack)
 {
     m_asyncCallStack = asyncCallStack;
 }
 
-void ConsoleMessage::windowCleared(LocalDOMWindow* window)
+void InspectorConsoleMessage::windowCleared(LocalDOMWindow* window)
 {
     if (m_scriptState.get() && m_scriptState.get()->domWindow() == window)
         m_scriptState.clear();
@@ -258,7 +257,7 @@ void ConsoleMessage::windowCleared(LocalDOMWindow* window)
     m_arguments.clear();
 }
 
-unsigned ConsoleMessage::argumentCount()
+unsigned InspectorConsoleMessage::argumentCount()
 {
     if (m_arguments)
         return m_arguments->argumentCount();