[DevTools] ConsoleMessage storage moved from ConsoleAgent

Source/core/inspector/PageConsoleAgent.cpp

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/PageConsoleAgent.h"
 
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
+#include "core/frame/FrameConsole.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorDOMAgent.h"
+#include "core/page/Page.h"
 
 namespace blink {
 
-PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent, InspectorTracingAgent* tracingAgent)
+PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent, InspectorTracingAgent* tracingAgent, Page* page)
     : InspectorConsoleAgent(timelineAgent, tracingAgent, injectedScriptManager)
     , m_inspectorDOMAgent(domAgent)
+    , m_page(page)
 {
 }
 
 PageConsoleAgent::~PageConsoleAgent()
 {
 #if !ENABLE(OILPAN)
     m_inspectorDOMAgent = nullptr;
 #endif
 }
 
 void PageConsoleAgent::trace(Visitor* visitor)
 {
     visitor->trace(m_inspectorDOMAgent);
     InspectorConsoleAgent::trace(visitor);
 }
 
 void PageConsoleAgent::clearMessages(ErrorString* errorString)
 {
     m_inspectorDOMAgent->releaseDanglingNodes();
     InspectorConsoleAgent::clearMessages(errorString);
 }
 
+ConsoleMessageStorage* PageConsoleAgent::messageStorage()
+{
+    Frame* frame = m_page->mainFrame();

[aandrey, 2014/08/26 08:56:42]

m_page->deprecatedLocalMainFrame() ?

[kozyatinskiy1, 2014/08/26 09:39:29]

Done.

+    ASSERT(frame->isLocalFrame());
+    return toLocalFrame(frame)->console().messageStorage();
+}
+
 class InspectableNode FINAL : public InjectedScriptHost::InspectableObject {
 public:
     explicit InspectableNode(Node* node) : m_node(node) { }
     virtual ScriptValue get(ScriptState* state) OVERRIDE
     {
         return InjectedScriptHost::nodeAsScriptValue(state, m_node);
     }
 private:
     Node* m_node;
 };
 
 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId)
 {
     Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
     if (!node) {
         *errorString = "nodeId is not valid";
         return;
     }
     while (node->isInShadowTree()) {
         Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node);
         if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowRoot::AuthorShadowRoot)
             break;
         // User agent shadow root, keep climbing up.
         node = toShadowRoot(ancestor).host();
     }
     m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(new InspectableNode(node)));
 }
 
 } // namespace blink