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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFormControlsCollection.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, 10 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/core/html/HTMLFormControlsCollection.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
index 4738a5c1978fa1a4ddc056e60e13d76ebbf92cf2..c573132ef3526c00392e69c7aeb6b2186efa0234 100644
--- a/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormControlsCollection.cpp
@@ -46,10 +46,10 @@ HTMLFormControlsCollection::HTMLFormControlsCollection(ContainerNode& ownerNode)
ASSERT(isHTMLFormElement(ownerNode) || isHTMLFieldSetElement(ownerNode));
}
-PassRefPtrWillBeRawPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType type)
+RawPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(ContainerNode& ownerNode, CollectionType type)
{
ASSERT_UNUSED(type, type == FormControls);
- return adoptRefWillBeNoop(new HTMLFormControlsCollection(ownerNode));
+ return (new HTMLFormControlsCollection(ownerNode));
}
HTMLFormControlsCollection::~HTMLFormControlsCollection()
@@ -64,7 +64,7 @@ const FormAssociatedElement::List& HTMLFormControlsCollection::formControlElemen
return toHTMLFieldSetElement(ownerNode()).associatedElements();
}
-const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>& HTMLFormControlsCollection::formImageElements() const
+const HeapVector<Member<HTMLImageElement>>& HTMLFormControlsCollection::formImageElements() const
{
return toHTMLFormElement(ownerNode()).imageElements();
}
@@ -110,7 +110,7 @@ void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const
}
static HTMLElement* firstNamedItem(const FormAssociatedElement::List& elementsArray,
- const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>* imageElementsArray, const QualifiedName& attrName, const String& name)
+ const HeapVector<Member<HTMLImageElement>>* imageElementsArray, const QualifiedName& attrName, const String& name)
{
ASSERT(attrName == idAttr || attrName == nameAttr);
@@ -141,7 +141,7 @@ HTMLElement* HTMLFormControlsCollection::namedItem(const AtomicString& name) con
// attribute. If a match is not found, the method then searches for an
// object with a matching name attribute, but only on those elements
// that are allowed a name attribute.
- const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>* imagesElements = isHTMLFieldSetElement(ownerNode()) ? 0 : &formImageElements();
+ const HeapVector<Member<HTMLImageElement>>* imagesElements = isHTMLFieldSetElement(ownerNode()) ? 0 : &formImageElements();
if (HTMLElement* item = firstNamedItem(formControlElements(), imagesElements, idAttr, name))
return item;
@@ -153,7 +153,7 @@ void HTMLFormControlsCollection::updateIdNameCache() const
if (hasValidIdNameCache())
return;
- OwnPtrWillBeRawPtr<NamedItemCache> cache = NamedItemCache::create();
+ RawPtr<NamedItemCache> cache = NamedItemCache::create();
HashSet<StringImpl*> foundInputElements;
const FormAssociatedElement::List& elementsArray = formControlElements();
@@ -176,7 +176,7 @@ void HTMLFormControlsCollection::updateIdNameCache() const
}
if (isHTMLFormElement(ownerNode())) {
- const WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement>>& imageElementsArray = formImageElements();
+ const HeapVector<Member<HTMLImageElement>>& imageElementsArray = formImageElements();
for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
HTMLImageElement* element = imageElementsArray[i];
const AtomicString& idAttrVal = element->getIdAttribute();
@@ -194,7 +194,7 @@ void HTMLFormControlsCollection::updateIdNameCache() const
void HTMLFormControlsCollection::namedGetter(const AtomicString& name, RadioNodeListOrElement& returnValue)
{
- WillBeHeapVector<RefPtrWillBeMember<Element>> namedItems;
+ HeapVector<Member<Element>> namedItems;
this->namedItems(name, namedItems);
if (namedItems.isEmpty())

Powered by Google App Engine
This is Rietveld 408576698