Cleanup ConsoleMessage interface.

third_party/WebKit/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 62 matching lines @@
         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 = frame().document();
     if (!context)
         return;
     if (!messageStorage())
         return;
 
-    String messageURL;
-    unsigned lineNumber = 0;
-    if (consoleMessage->callStack() && !consoleMessage->callStack()->isEmpty()) {
-        lineNumber = consoleMessage->callStack()->topLineNumber();
-        messageURL = consoleMessage->callStack()->topSourceURL();
-    } else {
-        lineNumber = consoleMessage->lineNumber();
-        messageURL = consoleMessage->url();
-    }
-
     messageStorage()->reportMessage(m_frame->document(), consoleMessage);
 
     if (consoleMessage->source() == NetworkMessageSource)
         return;
 
-    RefPtr<ScriptCallStack> reportedCallStack;
-    if (consoleMessage->source() != ConsoleAPIMessageSource) {
-        if (consoleMessage->callStack() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), messageURL))
-            reportedCallStack = consoleMessage->callStack();
-    } else {
+    String stackTrace;
+    if (consoleMessage->source() == ConsoleAPIMessageSource) {
         if (!frame().host() || (consoleMessage->scriptArguments() && !consoleMessage->scriptArguments()->argumentCount()))
             return;
-
         if (!allClientReportingMessageTypes().contains(consoleMessage->type()))
             return;
-
-        if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(), messageURL))
-            reportedCallStack = ScriptCallStack::capture();
+        if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(), consoleMessage->url()))
+            stackTrace = ScriptCallStack::capture()->toString();
+    } else {
+        if (consoleMessage->callStack() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), consoleMessage->url()))
+            stackTrace = consoleMessage->callStack()->toString();
     }
 
-    String stackTrace;
-    if (reportedCallStack)
-        stackTrace = reportedCallStack->toString();
-    frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), lineNumber, messageURL, stackTrace);
+    frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url(), stackTrace);
 }
 
 void FrameConsole::reportResourceResponseReceived(DocumentLoader* loader, unsigned long requestIdentifier, const ResourceResponse& response)
 {
     if (!loader)
         return;
     if (response.httpStatusCode() < 400)
         return;
     if (response.wasFallbackRequiredByServiceWorker())
         return;
     String message = "Failed to load resource: the server responded with a status of " + String::number(response.httpStatusCode()) + " (" + response.httpStatusText() + ')';
-    ConsoleMessage* consoleMessage = ConsoleMessage::create(NetworkMessageSource, ErrorMessageLevel, message, response.url().getString(), 0);
+    ConsoleMessage* consoleMessage = ConsoleMessage::create(NetworkMessageSource, ErrorMessageLevel, message, response.url().getString(), 0, 0);
     consoleMessage->setRequestIdentifier(requestIdentifier);
     addMessage(consoleMessage);
 }
 
 void FrameConsole::mute()
 {
     muteCount++;
 }
 
 void FrameConsole::unmute()
@@ skipping 29 matching lines @@
         return;
     ConsoleMessageStorage* storage = messageStorage();
     if (!storage)
         return;
     StringBuilder message;
     message.appendLiteral("Failed to load resource");
     if (!error.localizedDescription().isEmpty()) {
         message.appendLiteral(": ");
         message.append(error.localizedDescription());
     }
-    ConsoleMessage* consoleMessage = ConsoleMessage::create(NetworkMessageSource, ErrorMessageLevel, message.toString(), error.failingURL(), 0);
+    ConsoleMessage* consoleMessage = ConsoleMessage::create(NetworkMessageSource, ErrorMessageLevel, message.toString(), error.failingURL(), 0, 0);
     consoleMessage->setRequestIdentifier(requestIdentifier);
     storage->reportMessage(m_frame->document(), consoleMessage);
 }
 
 DEFINE_TRACE(FrameConsole)
 {
     visitor->trace(m_frame);
 }
 
 } // namespace blink