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

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

Issue 935283002: Rename {Author,UserAgent}ShadowRoot to {Open,Closed}ShadowRoot. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix inspector tests Created 5 years, 10 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/inspector/InspectorDOMAgent.cpp ('k') | Source/core/layout/HitTestResult.h » ('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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId) 149 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId)
150 { 150 {
151 Node* node = m_inspectorDOMAgent->nodeForId(nodeId); 151 Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
152 if (!node) { 152 if (!node) {
153 *errorString = "nodeId is not valid"; 153 *errorString = "nodeId is not valid";
154 return; 154 return;
155 } 155 }
156 while (node->isInShadowTree()) { 156 while (node->isInShadowTree()) {
157 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node); 157 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node);
158 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::AuthorShadowRoot) 158 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::OpenShadowRoot)
159 break; 159 break;
160 // User agent shadow root, keep climbing up. 160 // User agent shadow root, keep climbing up.
161 node = toShadowRoot(ancestor).host(); 161 node = toShadowRoot(ancestor).host();
162 } 162 }
163 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node))); 163 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node)));
164 } 164 }
165 165
166 } // namespace blink 166 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.cpp ('k') | Source/core/layout/HitTestResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698