| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/inspector/PageConsoleAgent.h" | 32 #include "core/inspector/PageConsoleAgent.h" |
| 33 | 33 |
| 34 #include "core/dom/Node.h" | 34 #include "core/dom/Node.h" |
| 35 #include "core/dom/NodeTraversal.h" | 35 #include "core/dom/NodeTraversal.h" |
| 36 #include "core/dom/shadow/ShadowRoot.h" | 36 #include "core/dom/shadow/ShadowRoot.h" |
| 37 #include "core/frame/FrameConsole.h" | 37 #include "core/frame/FrameConsole.h" |
| 38 #include "core/frame/FrameHost.h" |
| 38 #include "core/inspector/InjectedScriptHost.h" | 39 #include "core/inspector/InjectedScriptHost.h" |
| 39 #include "core/inspector/InjectedScriptManager.h" | 40 #include "core/inspector/InjectedScriptManager.h" |
| 40 #include "core/inspector/InspectorDOMAgent.h" | 41 #include "core/inspector/InspectorDOMAgent.h" |
| 41 #include "core/page/Page.h" | 42 #include "core/page/Page.h" |
| 42 | 43 |
| 43 namespace blink { | 44 namespace blink { |
| 44 | 45 |
| 45 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager,
InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent, Page* page) | 46 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager,
InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent, Page* page) |
| 46 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) | 47 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) |
| 47 , m_inspectorDOMAgent(domAgent) | 48 , m_inspectorDOMAgent(domAgent) |
| (...skipping 16 matching lines...) Expand all Loading... |
| 64 } | 65 } |
| 65 | 66 |
| 66 void PageConsoleAgent::clearMessages(ErrorString* errorString) | 67 void PageConsoleAgent::clearMessages(ErrorString* errorString) |
| 67 { | 68 { |
| 68 m_inspectorDOMAgent->releaseDanglingNodes(); | 69 m_inspectorDOMAgent->releaseDanglingNodes(); |
| 69 InspectorConsoleAgent::clearMessages(errorString); | 70 InspectorConsoleAgent::clearMessages(errorString); |
| 70 } | 71 } |
| 71 | 72 |
| 72 ConsoleMessageStorage* PageConsoleAgent::messageStorage() | 73 ConsoleMessageStorage* PageConsoleAgent::messageStorage() |
| 73 { | 74 { |
| 74 return m_page->deprecatedLocalMainFrame()->console().messageStorage(); | 75 return &m_page->frameHost().consoleMessageStorage(); |
| 75 } | 76 } |
| 76 | 77 |
| 77 class InspectableNode final : public InjectedScriptHost::InspectableObject { | 78 class InspectableNode final : public InjectedScriptHost::InspectableObject { |
| 78 public: | 79 public: |
| 79 explicit InspectableNode(Node* node) : m_node(node) { } | 80 explicit InspectableNode(Node* node) : m_node(node) { } |
| 80 virtual ScriptValue get(ScriptState* state) override | 81 virtual ScriptValue get(ScriptState* state) override |
| 81 { | 82 { |
| 82 return InjectedScriptHost::nodeAsScriptValue(state, m_node); | 83 return InjectedScriptHost::nodeAsScriptValue(state, m_node); |
| 83 } | 84 } |
| 84 private: | 85 private: |
| (...skipping 11 matching lines...) Expand all Loading... |
| 96 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node); | 97 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node); |
| 97 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR
oot::AuthorShadowRoot) | 98 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR
oot::AuthorShadowRoot) |
| 98 break; | 99 break; |
| 99 // User agent shadow root, keep climbing up. | 100 // User agent shadow root, keep climbing up. |
| 100 node = toShadowRoot(ancestor).host(); | 101 node = toShadowRoot(ancestor).host(); |
| 101 } | 102 } |
| 102 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); | 103 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); |
| 103 } | 104 } |
| 104 | 105 |
| 105 } // namespace blink | 106 } // namespace blink |
| OLD | NEW |