Remove dependency from ConsoleMessage to workers.

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 51 matching lines @@
 
 }
 
 FrameConsole::FrameConsole(LocalFrame& frame)
     : m_frame(&frame)
 {
 }
 
 void FrameConsole::addMessage(ConsoleMessage* consoleMessage)
 {
+    if (addMessageToStorage(consoleMessage))
+        reportMessageToClient(consoleMessage);
+}
+
+bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage)
+{
+    if (muteCount && consoleMessage->source() != ConsoleAPIMessageSource)
+        return false;
+    if (!m_frame->document() || !messageStorage())
+        return false;
+    messageStorage()->reportMessage(m_frame->document(), consoleMessage);
+    return true;
+}
+
+void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage)
+{
     if (muteCount && consoleMessage->source() != ConsoleAPIMessageSource)
         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;
-
-    messageStorage()->reportMessage(m_frame->document(), consoleMessage);
-
     if (consoleMessage->source() == NetworkMessageSource)
         return;
-
     if (consoleMessage->source() == ConsoleAPIMessageSource) {
         if (!frame().host() || (consoleMessage->scriptArguments() && !consoleMessage->scriptArguments()->argumentCount()))
             return;
         if (!allClientReportingMessageTypes().contains(consoleMessage->type()))
             return;
     }
 
     String stackTrace;
     if (consoleMessage->callStack() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), consoleMessage->url()))
         stackTrace = consoleMessage->callStack()->toString();
     frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url(), stackTrace);
 }
 
+void FrameConsole::reportWorkerMessage(ConsoleMessage* consoleMessage)
+{
+    reportMessageToClient(consoleMessage);
+}
+
+void FrameConsole::adoptWorkerMessage(ConsoleMessage* consoleMessage)
+{
+    addMessageToStorage(consoleMessage);
+}
+
 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, 0);
@@ skipping 19 matching lines @@
     return &m_frame->host()->consoleMessageStorage();
 }
 
 void FrameConsole::clearMessages()
 {
     ConsoleMessageStorage* storage = messageStorage();
     if (storage)
         storage->clear(m_frame->document());
 }
 
-void FrameConsole::adoptWorkerMessagesAfterTermination(WorkerInspectorProxy* proxy)
-{
-    ConsoleMessageStorage* storage = messageStorage();
-    if (storage)
-        storage->adoptWorkerMessagesAfterTermination(proxy);
-}
-
 void FrameConsole::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
 {
     if (error.isCancellation()) // Report failures only.
         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, 0);
     consoleMessage->setRequestIdentifier(requestIdentifier);
     storage->reportMessage(m_frame->document(), consoleMessage);
 }
 
 DEFINE_TRACE(FrameConsole)
 {
     visitor->trace(m_frame);
 }
 
 } // namespace blink