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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

Issue 2495623002: Rename traverseFrames to pierce and traverse shadow dom too. (Closed)
Patch Set: Rename traverseFrames to pierce. Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
index 1a05a309fa9c5ba3232b7827c5ebb22a2b04cdaf..58a4d046e3684eb5b349feb6d455fea3352e9dea 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -476,7 +476,7 @@ Response InspectorDOMAgent::disable() {
Response InspectorDOMAgent::getDocument(
Maybe<int> depth,
- Maybe<bool> traverseFrames,
+ Maybe<bool> pierce,
std::unique_ptr<protocol::DOM::Node>* root) {
// Backward compatibility. Mark agent as enabled when it requests document.
if (!enabled())
@@ -491,15 +491,15 @@ Response InspectorDOMAgent::getDocument(
if (sanitizedDepth == -1)
sanitizedDepth = INT_MAX;
- *root = buildObjectForNode(m_document.get(), sanitizedDepth,
- traverseFrames.fromMaybe(false),
- m_documentNodeToIdMap.get());
+ *root =
+ buildObjectForNode(m_document.get(), sanitizedDepth,
+ pierce.fromMaybe(false), m_documentNodeToIdMap.get());
return Response::OK();
}
void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId,
int depth,
- bool traverseFrames) {
+ bool pierce) {
Node* node = nodeForId(nodeId);
if (!node || (!node->isElementNode() && !node->isDocumentNode() &&
!node->isDocumentFragment()))
@@ -516,14 +516,14 @@ void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId,
for (node = innerFirstChild(node); node; node = innerNextSibling(node)) {
int childNodeId = nodeMap->get(node);
ASSERT(childNodeId);
- pushChildNodesToFrontend(childNodeId, depth, traverseFrames);
+ pushChildNodesToFrontend(childNodeId, depth, pierce);
}
return;
}
std::unique_ptr<protocol::Array<protocol::DOM::Node>> children =
- buildArrayForContainerChildren(node, depth, traverseFrames, nodeMap);
+ buildArrayForContainerChildren(node, depth, pierce, nodeMap);
frontend()->setChildNodes(nodeId, std::move(children));
}
@@ -1542,7 +1542,7 @@ static protocol::DOM::ShadowRootType shadowRootType(ShadowRoot* shadowRoot) {
std::unique_ptr<protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(
Node* node,
int depth,
- bool traverseFrames,
+ bool pierce,
NodeToIdMap* nodesMap) {
int id = bind(node, nodesMap);
String localName;
@@ -1589,8 +1589,8 @@ std::unique_ptr<protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(
: nullptr)
value->setFrameId(IdentifiersFactory::frameId(frame));
if (Document* doc = frameOwner->contentDocument()) {
- value->setContentDocument(buildObjectForNode(
- doc, traverseFrames ? depth : 0, traverseFrames, nodesMap));
+ value->setContentDocument(
+ buildObjectForNode(doc, pierce ? depth : 0, pierce, nodesMap));
}
}
@@ -1607,7 +1607,7 @@ std::unique_ptr<protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(
for (ShadowRoot* root = &shadow->youngestShadowRoot(); root;
root = root->olderShadowRoot()) {
shadowRoots->addItem(
- buildObjectForNode(root, 0, traverseFrames, nodesMap));
+ buildObjectForNode(root, pierce ? depth : 0, pierce, nodesMap));
}
value->setShadowRoots(std::move(shadowRoots));
forcePushChildren = true;
@@ -1617,16 +1617,15 @@ std::unique_ptr<protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(
HTMLLinkElement& linkElement = toHTMLLinkElement(*element);
if (linkElement.isImport() && linkElement.import() &&
innerParentNode(linkElement.import()) == linkElement) {
- value->setImportedDocument(buildObjectForNode(
- linkElement.import(), 0, traverseFrames, nodesMap));
+ value->setImportedDocument(
+ buildObjectForNode(linkElement.import(), 0, pierce, nodesMap));
}
forcePushChildren = true;
}
if (isHTMLTemplateElement(*element)) {
- value->setTemplateContent(
- buildObjectForNode(toHTMLTemplateElement(*element).content(), 0,
- traverseFrames, nodesMap));
+ value->setTemplateContent(buildObjectForNode(
+ toHTMLTemplateElement(*element).content(), 0, pierce, nodesMap));
forcePushChildren = true;
}
@@ -1681,7 +1680,7 @@ std::unique_ptr<protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(
if (forcePushChildren && !depth)
depth = 1;
std::unique_ptr<protocol::Array<protocol::DOM::Node>> children =
- buildArrayForContainerChildren(node, depth, traverseFrames, nodesMap);
+ buildArrayForContainerChildren(node, depth, pierce, nodesMap);
if (children->length() > 0 ||
depth) // Push children along with shadow in any case.
value->setChildren(std::move(children));
@@ -1707,7 +1706,7 @@ InspectorDOMAgent::buildArrayForElementAttributes(Element* element) {
std::unique_ptr<protocol::Array<protocol::DOM::Node>>
InspectorDOMAgent::buildArrayForContainerChildren(Node* container,
int depth,
- bool traverseFrames,
+ bool pierce,
NodeToIdMap* nodesMap) {
std::unique_ptr<protocol::Array<protocol::DOM::Node>> children =
protocol::Array<protocol::DOM::Node>::create();
@@ -1717,8 +1716,7 @@ InspectorDOMAgent::buildArrayForContainerChildren(Node* container,
Node* firstChild = container->firstChild();
if (firstChild && firstChild->getNodeType() == Node::kTextNode &&
!firstChild->nextSibling()) {
- children->addItem(
- buildObjectForNode(firstChild, 0, traverseFrames, nodesMap));
+ children->addItem(buildObjectForNode(firstChild, 0, pierce, nodesMap));
m_childrenRequested.add(bind(container, nodesMap));
}
return children;
@@ -1729,8 +1727,7 @@ InspectorDOMAgent::buildArrayForContainerChildren(Node* container,
m_childrenRequested.add(bind(container, nodesMap));
while (child) {
- children->addItem(
- buildObjectForNode(child, depth, traverseFrames, nodesMap));
+ children->addItem(buildObjectForNode(child, depth, pierce, nodesMap));
child = innerNextSibling(child);
}
return children;

Powered by Google App Engine
This is Rietveld 408576698