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

Unified Diff: Source/modules/accessibility/AXObject.cpp

Issue 1301993003: Last few steps of text alternative computation algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Testing all the special cases Created 5 years, 4 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: Source/modules/accessibility/AXObject.cpp
diff --git a/Source/modules/accessibility/AXObject.cpp b/Source/modules/accessibility/AXObject.cpp
index 96c971d3fc53639bf2ac4b169ea5382385c6b68a..c379641b2aee99c23efca6aa358b419f76b005e1 100644
--- a/Source/modules/accessibility/AXObject.cpp
+++ b/Source/modules/accessibility/AXObject.cpp
@@ -671,7 +671,7 @@ bool AXObject::isPresentationalChild() const
return m_cachedIsPresentationalChild;
}
-String AXObject::name(AXNameFrom& nameFrom, AXObjectVector& nameObjects) const
+String AXObject::name(AXNameFrom& nameFrom, AXObjectVector* nameObjects) const
{
WillBeHeapHashSet<RawPtrWillBeMember<const AXObject>> visited;
return textAlternative(false, false, visited, nameFrom, nameObjects, nullptr);
@@ -682,14 +682,13 @@ String AXObject::name(NameSources* nameSources) const
AXObjectSet visited;
AXNameFrom tmpNameFrom;
AXObjectVector tmpNameObjects;
- return textAlternative(false, false, visited, tmpNameFrom, tmpNameObjects, nameSources);
+ return textAlternative(false, false, visited, tmpNameFrom, &tmpNameObjects, nameSources);
}
String AXObject::recursiveTextAlternative(const AXObject& axObj, bool inAriaLabelledByTraversal, AXObjectSet& visited)
{
- AXNameFrom unusedRecursiveNameFrom;
- AXObjectVector unusedRecursiveNameObjects;
- return axObj.textAlternative(true, inAriaLabelledByTraversal, visited, unusedRecursiveNameFrom, unusedRecursiveNameObjects, nullptr);
+ AXNameFrom tmpNameFrom;
+ return axObj.textAlternative(true, inAriaLabelledByTraversal, visited, tmpNameFrom, nullptr, nullptr);
}
// In ARIA 1.1, the default value for aria-orientation changed from horizontal to undefined.

Powered by Google App Engine
This is Rietveld 408576698