Index: third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp |
diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp |
index 897aa823305752ee7080da440b2424c4485ccccd..18e16d3d3810a3d24900eed2af639c154c978258 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp |
+++ b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp |
@@ -26,18 +26,16 @@ String IgnoredReasonName(AXIgnoredReason reason) { |
return "ancestorDisallowsChild"; |
case kAXAncestorIsLeafNode: |
return "ancestorIsLeafNode"; |
- case kAXAriaHiddenElement: |
- return "ariaHiddenElement"; |
- case kAXAriaHiddenSubtree: |
- return "ariaHiddenSubtree"; |
+ case kAXAriaHidden: |
+ return "ariaHidden"; |
+ case kAXAriaHiddenRoot: |
+ return "ariaHiddenRoot"; |
case kAXEmptyAlt: |
return "emptyAlt"; |
case kAXEmptyText: |
return "emptyText"; |
- case kAXInertElement: |
- return "inertElement"; |
- case kAXInertSubtree: |
- return "inertSubtree"; |
+ case kAXInert: |
+ return "inert"; |
case kAXInheritsPresentation: |
return "inheritsPresentation"; |
case kAXLabelContainer: |
@@ -99,7 +97,7 @@ std::unique_ptr<AXValue> CreateBooleanValue(bool value, const String& type) { |
.build(); |
} |
-std::unique_ptr<AXRelatedNode> RelatedNodeForAXObjectImpl( |
+std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject( |
const AXObjectImpl& ax_object, |
String* name = nullptr) { |
Node* node = ax_object.GetNode(); |
@@ -129,7 +127,7 @@ std::unique_ptr<AXValue> CreateRelatedNodeListValue( |
const String& value_type) { |
std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes = |
protocol::Array<AXRelatedNode>::create(); |
- related_nodes->addItem(RelatedNodeForAXObjectImpl(ax_object, name)); |
+ related_nodes->addItem(RelatedNodeForAXObject(ax_object, name)); |
return AXValue::create() |
.setType(value_type) |
.setRelatedNodes(std::move(related_nodes)) |
@@ -143,8 +141,8 @@ std::unique_ptr<AXValue> CreateRelatedNodeListValue( |
protocol::Array<AXRelatedNode>::create(); |
for (unsigned i = 0; i < related_objects.size(); i++) { |
std::unique_ptr<AXRelatedNode> frontend_related_node = |
- RelatedNodeForAXObjectImpl(*(related_objects[i]->object), |
- &(related_objects[i]->text)); |
+ RelatedNodeForAXObject(*(related_objects[i]->object), |
+ &(related_objects[i]->text)); |
if (frontend_related_node) |
frontend_related_nodes->addItem(std::move(frontend_related_node)); |
} |
@@ -161,7 +159,7 @@ std::unique_ptr<AXValue> CreateRelatedNodeListValue( |
protocol::Array<AXRelatedNode>::create(); |
for (unsigned i = 0; i < ax_objects.size(); i++) { |
std::unique_ptr<AXRelatedNode> related_node = |
- RelatedNodeForAXObjectImpl(*(ax_objects[i].Get())); |
+ RelatedNodeForAXObject(*(ax_objects[i].Get())); |
if (related_node) |
related_nodes->addItem(std::move(related_node)); |
} |