Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / FrameConsole.cpp

diff --git a/src/third_party/WebKit/Source/core/frame/FrameConsole.cpp b/src/third_party/WebKit/Source/core/frame/FrameConsole.cpp
index bc1a110..28dc4d3 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/FrameConsole.cpp
+++ b/src/third_party/WebKit/Source/core/frame/FrameConsole.cpp
@@ -29,16 +29,18 @@
 #include "config.h"
 #include "core/frame/FrameConsole.h"
 
-#include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleAPITypes.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
+#include "core/inspector/ScriptCallStack.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
+#include "core/workers/WorkerGlobalScopeProxy.h"
 #include "wtf/text/StringBuilder.h"
 
-namespace WebCore {
+namespace blink {
 
 namespace {
 
@@ -51,17 +53,7 @@ FrameConsole::FrameConsole(LocalFrame& frame)
 {
 }
 
-void FrameConsole::addMessage(MessageSource source, MessageLevel level, const String& message)
-{
-    addMessage(source, level, message, String(), 0, 0, nullptr, 0, 0);
-}
-
-void FrameConsole::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
-{
-    addMessage(source, level, message, String(), 0, 0, callStack, 0);
-}
-
-void FrameConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, ScriptState* scriptState, unsigned long requestIdentifier)
+void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleMessage)
 {
     if (muteCount)
         return;
@@ -72,23 +64,23 @@ void FrameConsole::addMessage(MessageSource source, MessageLevel level, const St
     if (!context)
         return;
 
+    RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
+    InspectorInstrumentation::addMessageToConsole(context, consoleMessage.get());
+
     String messageURL;
-    if (callStack) {
-        messageURL = callStack->at(0).sourceURL();
-        InspectorInstrumentation::addMessageToConsole(context, source, LogMessageType, level, message, callStack, requestIdentifier);
-    } else {
-        messageURL = url;
-        InspectorInstrumentation::addMessageToConsole(context, source, LogMessageType, level, message, url, lineNumber, columnNumber, scriptState, requestIdentifier);
-    }
+    if (consoleMessage->callStack())
+        messageURL = consoleMessage->callStack()->at(0).sourceURL();
+    else
+        messageURL = consoleMessage->url();
 
-    if (source == CSSMessageSource)
+    if (consoleMessage->source() == CSSMessageSource)
         return;
 
     String stackTrace;
-    if (callStack && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
-        stackTrace = FrameConsole::formatStackTraceString(message, callStack);
+    if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(consoleMessage->url()))
+        stackTrace = FrameConsole::formatStackTraceString(consoleMessage->message(), consoleMessage->callStack());
 
-    m_frame.chromeClient().addMessageToConsole(&m_frame, source, level, message, lineNumber, messageURL, stackTrace);
+    m_frame.chromeClient().addMessageToConsole(&m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), messageURL, stackTrace);
 }
 
 String FrameConsole::formatStackTraceString(const String& originalMessage, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
@@ -120,4 +112,9 @@ void FrameConsole::unmute()
     muteCount--;
 }
 
-} // namespace WebCore
+void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy)
+{
+    InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), proxy);
+}
+
+} // namespace blink