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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/AXObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
index 83703b1a8595aac2920b740e707cd40372c66381..1e9d80987d6e1345fe0acef87c0cf8e5d628c86f 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
@@ -825,7 +825,7 @@ String AXObject::ariaTextAlternative(bool recursive, bool inAriaLabelledByTraver
return textAlternative;
}
-String AXObject::textFromElements(bool inAriaLabelledbyTraversal, AXObjectSet& visited, WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, AXRelatedObjectVector* relatedObjects) const
+String AXObject::textFromElements(bool inAriaLabelledbyTraversal, AXObjectSet& visited, HeapVector<Member<Element>>& elements, AXRelatedObjectVector* relatedObjects) const
{
StringBuilder accumulatedText;
bool foundValidElement = false;
@@ -866,7 +866,7 @@ void AXObject::tokenVectorFromAttribute(Vector<String>& tokens, const QualifiedN
attributeValue.split(' ', tokens);
}
-void AXObject::elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements, const QualifiedName& attribute) const
+void AXObject::elementsFromAttribute(HeapVector<Member<Element>>& elements, const QualifiedName& attribute) const
{
Vector<String> ids;
tokenVectorFromAttribute(ids, attribute);
@@ -880,7 +880,7 @@ void AXObject::elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element
}
}
-void AXObject::ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<Element>>& elements) const
+void AXObject::ariaLabelledbyElementVector(HeapVector<Member<Element>>& elements) const
{
// Try both spellings, but prefer aria-labelledby, which is the official spec.
elementsFromAttribute(elements, aria_labelledbyAttr);
@@ -890,7 +890,7 @@ void AXObject::ariaLabelledbyElementVector(WillBeHeapVector<RawPtrWillBeMember<E
String AXObject::textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVector* relatedObjects) const
{
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
ariaLabelledbyElementVector(elements);
return textFromElements(true, visited, elements, relatedObjects);
}
@@ -898,7 +898,7 @@ String AXObject::textFromAriaLabelledby(AXObjectSet& visited, AXRelatedObjectVec
String AXObject::textFromAriaDescribedby(AXRelatedObjectVector* relatedObjects) const
{
AXObjectSet visited;
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
elementsFromAttribute(elements, aria_describedbyAttr);
return textFromElements(true, visited, elements, relatedObjects);
}

Powered by Google App Engine
This is Rietveld 408576698