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 21 matching lines...) Expand all Loading... |
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/shadow/ShadowRoot.h" | 35 #include "core/dom/shadow/ShadowRoot.h" |
36 #include "core/inspector/InjectedScriptHost.h" | 36 #include "core/inspector/InjectedScriptHost.h" |
37 #include "core/inspector/InjectedScriptManager.h" | 37 #include "core/inspector/InjectedScriptManager.h" |
38 #include "core/inspector/InspectorDOMAgent.h" | 38 #include "core/inspector/InspectorDOMAgent.h" |
39 | 39 |
40 namespace WebCore { | 40 namespace WebCore { |
41 | 41 |
42 PageConsoleAgent::PageConsoleAgent(InstrumentingAgents* instrumentingAgents, Ins
pectorCompositeState* state, InjectedScriptManager* injectedScriptManager, Inspe
ctorDOMAgent* domAgent) | 42 PageConsoleAgent::PageConsoleAgent(InstrumentingAgents* instrumentingAgents, Ins
pectorCompositeState* state, InjectedScriptManager* injectedScriptManager, Inspe
ctorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent) |
43 : InspectorConsoleAgent(instrumentingAgents, state, injectedScriptManager) | 43 : InspectorConsoleAgent(instrumentingAgents, timelineAgent, state, injectedS
criptManager) |
44 , m_inspectorDOMAgent(domAgent) | 44 , m_inspectorDOMAgent(domAgent) |
45 { | 45 { |
46 } | 46 } |
47 | 47 |
48 PageConsoleAgent::~PageConsoleAgent() | 48 PageConsoleAgent::~PageConsoleAgent() |
49 { | 49 { |
50 m_inspectorDOMAgent = 0; | 50 m_inspectorDOMAgent = 0; |
51 } | 51 } |
52 | 52 |
53 void PageConsoleAgent::clearMessages(ErrorString* errorString) | 53 void PageConsoleAgent::clearMessages(ErrorString* errorString) |
(...skipping 24 matching lines...) Expand all Loading... |
78 Node* ancestor = node->highestAncestor(); | 78 Node* ancestor = node->highestAncestor(); |
79 if (!ancestor->isShadowRoot() || toShadowRoot(ancestor)->type() == Shado
wRoot::AuthorShadowRoot) | 79 if (!ancestor->isShadowRoot() || toShadowRoot(ancestor)->type() == Shado
wRoot::AuthorShadowRoot) |
80 break; | 80 break; |
81 // User agent shadow root, keep climbing up. | 81 // User agent shadow root, keep climbing up. |
82 node = toShadowRoot(ancestor)->host(); | 82 node = toShadowRoot(ancestor)->host(); |
83 } | 83 } |
84 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); | 84 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); |
85 } | 85 } |
86 | 86 |
87 } // namespace WebCore | 87 } // namespace WebCore |
OLD | NEW |