Remove dependency from ConsoleMessage to workers.

third_party/WebKit/Source/core/frame/FrameConsole.cpp

Index: third_party/WebKit/Source/core/frame/FrameConsole.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameConsole.cpp b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
index 1afe0307d8b7618e5a48cb65e42adcdf5d158814..07842cd3a8d210246b8e38e93acc3a64c8307cf4 100644
--- a/third_party/WebKit/Source/core/frame/FrameConsole.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
@@ -69,22 +69,26 @@ FrameConsole::FrameConsole(LocalFrame& frame)
 
 void FrameConsole::addMessage(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;
+    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;
     if (consoleMessage->source() == NetworkMessageSource)
         return;
-
     if (consoleMessage->source() == ConsoleAPIMessageSource) {
         if (!frame().host() || (consoleMessage->scriptArguments() && !consoleMessage->scriptArguments()->argumentCount()))
             return;
@@ -98,6 +102,16 @@ void FrameConsole::addMessage(ConsoleMessage* consoleMessage)
     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)
@@ -137,13 +151,6 @@ void FrameConsole::clearMessages()
         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.