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

Unified Diff: third_party/WebKit/Source/modules/accessibility/AXNodeObject.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/AXNodeObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
index e8c8ac3db90bf336a64bf7df11075f0b2eb1cd51..36a4afcaad658dcc33d08361997dda629950d440 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
@@ -112,7 +112,7 @@ static String accessibleNameForNode(Node* node)
return String();
}
-String AXNodeObject::accessibilityDescriptionForElements(WillBeHeapVector<RawPtrWillBeMember<Element>> &elements) const
+String AXNodeObject::accessibilityDescriptionForElements(HeapVector<Member<Element>> &elements) const
{
StringBuilder builder;
unsigned size = elements.size();
@@ -552,7 +552,7 @@ AccessibilityRole AXNodeObject::determineAriaRoleAttribute() const
void AXNodeObject::accessibilityChildrenFromAttribute(QualifiedName attr, AXObject::AXObjectVector& children) const
{
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
elementsFromAttribute(elements, attr);
AXObjectCacheImpl& cache = axObjectCache();
@@ -1300,7 +1300,7 @@ InvalidState AXNodeObject::getInvalidState() const
if (getNode() && getNode()->isElementNode()
&& toElement(getNode())->isFormControlElement()) {
HTMLFormControlElement* element = toHTMLFormControlElement(getNode());
- WillBeHeapVector<RefPtrWillBeMember<HTMLFormControlElement>>
+ HeapVector<Member<HTMLFormControlElement>>
invalidControls;
bool isInvalid = !element->checkValidity(
&invalidControls, CheckValidityDispatchNoEvent);
@@ -1412,7 +1412,7 @@ String AXNodeObject::stringValue() const
if (isHTMLSelectElement(*node)) {
HTMLSelectElement& selectElement = toHTMLSelectElement(*node);
int selectedIndex = selectElement.selectedIndex();
- const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = selectElement.listItems();
+ const HeapVector<Member<HTMLElement>>& listItems = selectElement.listItems();
if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
const AtomicString& overriddenDescription = listItems[selectedIndex]->fastGetAttribute(aria_labelAttr);
if (!overriddenDescription.isNull())
@@ -1440,7 +1440,7 @@ String AXNodeObject::stringValue() const
String AXNodeObject::ariaDescribedByAttribute() const
{
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
elementsFromAttribute(elements, aria_describedbyAttr);
return accessibilityDescriptionForElements(elements);
@@ -1448,7 +1448,7 @@ String AXNodeObject::ariaDescribedByAttribute() const
String AXNodeObject::ariaLabelledbyAttribute() const
{
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
ariaLabelledbyElementVector(elements);
return accessibilityDescriptionForElements(elements);
@@ -1660,7 +1660,7 @@ bool AXNodeObject::nameFromLabelElement() const
return false;
// Step 2B from: http://www.w3.org/TR/accname-aam-1.1
- WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
+ HeapVector<Member<Element>> elements;
ariaLabelledbyElementVector(elements);
if (elements.size() > 0)
return false;

Powered by Google App Engine
This is Rietveld 408576698