Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: Source/core/inspector/PageConsoleAgent.cpp

Issue 425383002: Move highestAncestorOrSelf() from Node to NodeTraversal (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLImageElement.cpp ('k') | Source/core/xml/XPathPath.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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/shadow/ShadowRoot.h" 36 #include "core/dom/shadow/ShadowRoot.h"
36 #include "core/inspector/InjectedScriptHost.h" 37 #include "core/inspector/InjectedScriptHost.h"
37 #include "core/inspector/InjectedScriptManager.h" 38 #include "core/inspector/InjectedScriptManager.h"
38 #include "core/inspector/InspectorDOMAgent.h" 39 #include "core/inspector/InspectorDOMAgent.h"
39 40
40 namespace blink { 41 namespace blink {
41 42
42 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent) 43 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent)
43 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) 44 : InspectorConsoleAgent(timelineAgent, injectedScriptManager)
44 , m_inspectorDOMAgent(domAgent) 45 , m_inspectorDOMAgent(domAgent)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 }; 77 };
77 78
78 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId) 79 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId)
79 { 80 {
80 Node* node = m_inspectorDOMAgent->nodeForId(nodeId); 81 Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
81 if (!node) { 82 if (!node) {
82 *errorString = "nodeId is not valid"; 83 *errorString = "nodeId is not valid";
83 return; 84 return;
84 } 85 }
85 while (node->isInShadowTree()) { 86 while (node->isInShadowTree()) {
86 Node& ancestor = node->highestAncestorOrSelf(); 87 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node);
87 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::AuthorShadowRoot) 88 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::AuthorShadowRoot)
88 break; 89 break;
89 // User agent shadow root, keep climbing up. 90 // User agent shadow root, keep climbing up.
90 node = toShadowRoot(ancestor).host(); 91 node = toShadowRoot(ancestor).host();
91 } 92 }
92 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node))); 93 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node)));
93 } 94 }
94 95
95 } // namespace blink 96 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLImageElement.cpp ('k') | Source/core/xml/XPathPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698