DevTools: Make FrameConsole methods accept ConsoleMessage objects.

Source/core/frame/FrameConsole.cpp

 /*
  * Copyright (C) 2013 Apple 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/frame/FrameConsole.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleAPITypes.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
 
 namespace {
 
 int muteCount = 0;
 
 }
 
 FrameConsole::FrameConsole(LocalFrame& frame)
     : m_frame(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> prpConsoleError)
 {
     if (muteCount)
         return;
 
     // FIXME: This should not need to reach for the main-frame.
     // Inspector code should just take the current frame and know how to walk itself.
     ExecutionContext* context = m_frame.document();
     if (!context)
         return;
 
+    RefPtr<ConsoleMessage> consoleError = prpConsoleError;
+
     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 (consoleError->callStack())
+        messageURL = consoleError->callStack()->at(0).sourceURL();
+    else
+        messageURL = consoleError->url();
 
-    if (source == CSSMessageSource)
+    InspectorInstrumentation::addMessageToConsole(context, consoleError);
+
+    if (consoleError->source() == CSSMessageSource)
         return;
 
     String stackTrace;
-    if (callStack && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
-        stackTrace = FrameConsole::formatStackTraceString(message, callStack);
+    if (consoleError->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
+        stackTrace = FrameConsole::formatStackTraceString(consoleError->message(), consoleError->callStack());
 
-    m_frame.chromeClient().addMessageToConsole(&m_frame, source, level, message, lineNumber, messageURL, stackTrace);
+    m_frame.chromeClient().addMessageToConsole(&m_frame, consoleError->source(), consoleError->level(), consoleError->message(), consoleError->lineNumber(), messageURL, stackTrace);
 }
 
 String FrameConsole::formatStackTraceString(const String& originalMessage, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
 {
     StringBuilder stackTrace;
     for (size_t i = 0; i < callStack->size(); ++i) {
         const ScriptCallFrame& frame = callStack->at(i);
         stackTrace.append("\n    at " + (frame.functionName().length() ? frame.functionName() : "(anonymous function)"));
         stackTrace.append(" (");
         stackTrace.append(frame.sourceURL());
@@ skipping 12 matching lines @@
     muteCount++;
 }
 
 void FrameConsole::unmute()
 {
     ASSERT(muteCount > 0);
     muteCount--;
 }
 
 } // namespace WebCore