summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit
diff options
context:
space:
mode:
authoraboxhall@chromium.org <aboxhall@chromium.org>2015-04-03 04:56:07 +0000
committeraboxhall@chromium.org <aboxhall@chromium.org>2015-04-03 04:56:07 +0000
commitdedcd3dc7983e22e08a4bb3b7557d89d740d627c (patch)
treea059b5ae83d8b77da860eaa0428433ddd55f3882 /third_party/WebKit
parent47a57b7079c8a8fc45bb4fab7c4785b3429163bb (diff)
downloadchromium_src-dedcd3dc7983e22e08a4bb3b7557d89d740d627c.zip
chromium_src-dedcd3dc7983e22e08a4bb3b7557d89d740d627c.tar.gz
chromium_src-dedcd3dc7983e22e08a4bb3b7557d89d740d627c.tar.bz2
Show accessibility information for all nodes which have an associated accessibility node (e.g. static text).
BUG=390254 Review URL: https://codereview.chromium.org/1058063002 git-svn-id: svn://svn.chromium.org/blink/trunk@193080 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit')
-rw-r--r--third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
index 9035e6f..75ce6d8 100644
--- a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp
@@ -383,11 +383,11 @@ void fillRelationships(AXObject* axObject, PassRefPtr<TypeBuilder::Array<AXPrope
results.clear();
}
-PassRefPtr<AXNode> buildObjectForNode(Element* element, AXObject* axObject, AXObjectCacheImpl* cacheImpl, PassRefPtr<TypeBuilder::Array<AXProperty>> properties)
+PassRefPtr<AXNode> buildObjectForNode(Node* node, AXObject* axObject, AXObjectCacheImpl* cacheImpl, PassRefPtr<TypeBuilder::Array<AXProperty>> properties)
{
AccessibilityRole role = axObject->roleValue();
RefPtr<AXNode> nodeObject = AXNode::create().setNodeId(String::number(axObject->axObjectID())).setRole(createValue(AXObject::roleName(role), AXValueType::Role)).setProperties(properties);
- String computedName = cacheImpl->computedNameForNode(element);
+ String computedName = cacheImpl->computedNameForNode(node);
if (!computedName.isEmpty())
nodeObject->setName(createValue(computedName));
@@ -416,13 +416,13 @@ void InspectorAccessibilityAgent::getAXNode(ErrorString* errorString, int nodeId
*errorString = "DOM agent must be enabled";
return;
}
- Element* element = domAgent->assertElement(errorString, nodeId);
- if (!element)
+ Node* node = domAgent->assertNode(errorString, nodeId);
+ if (!node)
return;
- Document& document = element->document();
+ Document& document = node->document();
ScopedAXObjectCache cache(document);
AXObjectCacheImpl* cacheImpl = toAXObjectCacheImpl(cache.get());
- AXObject* axObject = cacheImpl->getOrCreate(element);
+ AXObject* axObject = cacheImpl->getOrCreate(node);
if (!axObject)
return;
@@ -433,7 +433,7 @@ void InspectorAccessibilityAgent::getAXNode(ErrorString* errorString, int nodeId
fillWidgetStates(axObject, properties);
fillRelationships(axObject, properties);
- accessibilityNode = buildObjectForNode(element, axObject, cacheImpl, properties);
+ accessibilityNode = buildObjectForNode(node, axObject, cacheImpl, properties);
}
DEFINE_TRACE(InspectorAccessibilityAgent)