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

Unified Diff: third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp

Issue 2088453002: Implement the inert attribute (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert histograms.xml Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
index ea56db8be1e23f4e414b7134d8164eed47a0d8ab..090379f4bb2021e8b6acfce208042521867bbc73 100644
--- a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
@@ -475,9 +475,9 @@ Response InspectorAccessibilityAgent::getPartialAXTree(
*nodes, *cache));
return Response::OK();
} else {
- (*nodes)->addItem(
- BuildProtocolAXObject(*inspected_ax_object, inspected_ax_object,
- fetch_relatives.fromMaybe(true), *nodes, *cache));
+ (*nodes)->addItem(BuildProtocolAXObjectImpl(
+ *inspected_ax_object, inspected_ax_object,
+ fetch_relatives.fromMaybe(true), *nodes, *cache));
}
if (!inspected_ax_object)
@@ -500,8 +500,8 @@ void InspectorAccessibilityAgent::AddAncestors(
AXObjectCacheImpl& cache) const {
AXObjectImpl* ancestor = &first_ancestor;
while (ancestor) {
- nodes->addItem(BuildProtocolAXObject(*ancestor, inspected_ax_object, true,
- nodes, cache));
+ nodes->addItem(BuildProtocolAXObjectImpl(*ancestor, inspected_ax_object,
+ true, nodes, cache));
ancestor = ancestor->ParentObjectUnignored();
}
}
@@ -577,7 +577,7 @@ void InspectorAccessibilityAgent::PopulateDOMNodeAncestors(
// Populate parent and ancestors.
std::unique_ptr<AXNode> parent_node_object =
- BuildProtocolAXObject(*parent_ax_object, nullptr, true, nodes, cache);
+ BuildProtocolAXObjectImpl(*parent_ax_object, nullptr, true, nodes, cache);
std::unique_ptr<protocol::Array<AXNodeId>> child_ids =
protocol::Array<AXNodeId>::create();
child_ids->addItem(String::Number(kIDForInspectedNodeWithNoAXNode));
@@ -590,7 +590,7 @@ void InspectorAccessibilityAgent::PopulateDOMNodeAncestors(
AddAncestors(*grandparent_ax_object, nullptr, nodes, cache);
}
-std::unique_ptr<AXNode> InspectorAccessibilityAgent::BuildProtocolAXObject(
+std::unique_ptr<AXNode> InspectorAccessibilityAgent::BuildProtocolAXObjectImpl(
AXObjectImpl& ax_object,
AXObjectImpl* inspected_ax_object,
bool fetch_relatives,
@@ -724,15 +724,16 @@ void InspectorAccessibilityAgent::AddChildren(
child_ids->addItem(String::Number(child_ax_object.AxObjectID()));
if (&child_ax_object == inspected_ax_object)
continue;
- if (&ax_object != inspected_ax_object &&
- (ax_object.GetNode() ||
- ax_object.ParentObjectUnignored() != inspected_ax_object)) {
- continue;
+ if (&ax_object != inspected_ax_object) {
+ if (!inspected_ax_object)
+ continue;
+ if (&ax_object != inspected_ax_object->ParentObjectUnignored())
+ continue;
}
// Only add children of inspected node (or un-inspectable children of
// inspected node) to returned nodes.
- std::unique_ptr<AXNode> child_node = BuildProtocolAXObject(
+ std::unique_ptr<AXNode> child_node = BuildProtocolAXObjectImpl(
child_ax_object, inspected_ax_object, true, nodes, cache);
nodes->addItem(std::move(child_node));
}

Powered by Google App Engine
This is Rietveld 408576698