[DevTools] ConsoleMessage storage moved from ConsoleAgent

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 15 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/frame/FrameConsole.h"
 
 #include "bindings/core/v8/ScriptCallStackFactory.h"
 #include "core/frame/FrameHost.h"
 #include "core/inspector/ConsoleAPITypes.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/inspector/ConsoleMessageStorage.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 blink {
 
 namespace {
 
 int muteCount = 0;
 
 }
 
 FrameConsole::FrameConsole(LocalFrame& frame)
     : m_frame(frame)
 {
 }
 
+FrameConsole::~FrameConsole()
+{
+}
+
 void FrameConsole::addMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpConsoleMessage)
 {
     RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
     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 = m_frame.document();
     if (!context)
         return;
 
-    InspectorInstrumentation::addMessageToConsole(context, consoleMessage.get());
-
-    if (consoleMessage->source() == CSSMessageSource)
-        return;
-
     String messageURL;
     unsigned lineNumber = 0;
-    if (consoleMessage->callStack()) {
+    if (consoleMessage->callStack() && consoleMessage->callStack()->size()) {
         lineNumber = consoleMessage->callStack()->at(0).lineNumber();
         messageURL = consoleMessage->callStack()->at(0).sourceURL();
     } else {
         lineNumber = consoleMessage->lineNumber();
         messageURL = consoleMessage->url();
     }
 
+    messageStorage()->reportMessage(consoleMessage);
+
+    if (consoleMessage->source() == CSSMessageSource)
+        return;
+
     RefPtrWillBeRawPtr<ScriptCallStack> reportedCallStack = nullptr;
     if (consoleMessage->source() != ConsoleAPIMessageSource) {
         if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDetailedMessageForSource(messageURL))
             reportedCallStack = consoleMessage->callStack();
     } else {
         if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMessage->scriptArguments()->argumentCount() == 0))
             return;
 
         MessageType type = consoleMessage->type();
         if (type == StartGroupMessageType || type == EndGroupMessageType || type == StartGroupCollapsedMessageType)
@@ skipping 31 matching lines @@
 {
     muteCount++;
 }
 
 void FrameConsole::unmute()
 {
     ASSERT(muteCount > 0);
     muteCount--;
 }
 
+ConsoleMessageStorage* FrameConsole::messageStorage()
+{
+    LocalFrame* curFrame = &m_frame;
+    Frame* topFrame = curFrame->tree().top();
+    ASSERT(topFrame->isLocalFrame());
+    LocalFrame* localTopFrame = toLocalFrame(topFrame);
+    if (localTopFrame != curFrame)
+        return localTopFrame->console().messageStorage();
+    if (!m_consoleMessageStorage)
+        m_consoleMessageStorage = ConsoleMessageStorage::createForFrame(&m_frame);
+    return m_consoleMessageStorage.get();
+}
+
 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy)
 {
     InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), proxy);
 }
 
 } // namespace blink