[DevTools] Console Message Storage moved from top local frame to frame host

Source/core/inspector/ConsoleMessageStorage.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 
 #include "core/frame/LocalDOMWindow.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 
 namespace blink {
 
 static const unsigned maxConsoleMessageCount = 1000;
 
 ConsoleMessageStorage::ConsoleMessageStorage(ExecutionContext* context)
     : m_expiredCount(0)
     , m_context(context)
-    , m_frame(nullptr)
+    , m_frameHost(nullptr)
 {
 }
 
-ConsoleMessageStorage::ConsoleMessageStorage(LocalFrame* frame)
+ConsoleMessageStorage::ConsoleMessageStorage(FrameHost* frameHost)
     : m_expiredCount(0)
     , m_context(nullptr)
-    , m_frame(frame)
+    , m_frameHost(frameHost)
 {
 }
 
 void ConsoleMessageStorage::reportMessage(PassRefPtrWillBeRawPtr<ConsoleMessage> prpMessage)
 {
     RefPtrWillBeRawPtr<ConsoleMessage> message = prpMessage;
     message->collectCallStack();
 
     if (message->type() == ClearMessageType)
         clear();
 
-    InspectorInstrumentation::addMessageToConsole(executionContext(), message.get());
+    if (m_frameHost)
+        InspectorInstrumentation::addMessageToConsole(m_frameHost, message.get());
+    else
+        InspectorInstrumentation::addMessageToConsole(m_context, message.get());
 
     ASSERT(m_messages.size() <= maxConsoleMessageCount);
     if (m_messages.size() == maxConsoleMessageCount) {
         ++m_expiredCount;
         m_messages.removeFirst();
     }
     m_messages.append(message);
 }
 
 void ConsoleMessageStorage::clear()
 {
-    InspectorInstrumentation::consoleMessagesCleared(executionContext());
+    if (m_frameHost)
+        InspectorInstrumentation::consoleMessagesCleared(m_frameHost);
+    else
+        InspectorInstrumentation::consoleMessagesCleared(m_context);
     m_messages.clear();
     m_expiredCount = 0;
 }
 
 Vector<unsigned> ConsoleMessageStorage::argumentCounts() const
 {
     Vector<unsigned> result(m_messages.size());
     for (size_t i = 0; i < m_messages.size(); ++i)
         result[i] = m_messages[i]->argumentCount();
     return result;
@@ skipping 21 matching lines @@
 ConsoleMessage* ConsoleMessageStorage::at(size_t index) const
 {
     return m_messages[index].get();
 }
 
 int ConsoleMessageStorage::expiredCount() const
 {
     return m_expiredCount;
 }
 
-ExecutionContext* ConsoleMessageStorage::executionContext() const
-{
-    return m_frame ? m_frame->document() : m_context;
-}
-
 void ConsoleMessageStorage::trace(Visitor* visitor)
 {
     visitor->trace(m_messages);
     visitor->trace(m_context);
-    visitor->trace(m_frame);
+    visitor->trace(m_frameHost);
 }
 
 } // namespace blink