| Index: third_party/WebKit/Source/core/html/HTMLCollection.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLCollection.cpp b/third_party/WebKit/Source/core/html/HTMLCollection.cpp
|
| index 194ae8edd4119b95a938aabbbbe35ac2f52ceda0..eb3b6a30692535c3600551d81cec0dd40428e490 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLCollection.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLCollection.cpp
|
| @@ -169,9 +169,9 @@ HTMLCollection::HTMLCollection(ContainerNode& ownerNode, CollectionType type, It
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<HTMLCollection> HTMLCollection::create(ContainerNode& base, CollectionType type)
|
| +RawPtr<HTMLCollection> HTMLCollection::create(ContainerNode& base, CollectionType type)
|
| {
|
| - return adoptRefWillBeNoop(new HTMLCollection(base, type, DoesNotOverrideItemAfter));
|
| + return new HTMLCollection(base, type, DoesNotOverrideItemAfter);
|
| }
|
|
|
| HTMLCollection::~HTMLCollection()
|
| @@ -290,7 +290,7 @@ public:
|
| }
|
|
|
| private:
|
| - RawPtrWillBeMember<const HTMLCollectionType> m_list;
|
| + Member<const HTMLCollectionType> m_list;
|
| };
|
|
|
| } // namespace
|
| @@ -399,11 +399,11 @@ Element* HTMLCollection::namedItem(const AtomicString& name) const
|
| updateIdNameCache();
|
|
|
| const NamedItemCache& cache = namedItemCache();
|
| - WillBeHeapVector<RawPtrWillBeMember<Element>>* idResults = cache.getElementsById(name);
|
| + HeapVector<Member<Element>>* idResults = cache.getElementsById(name);
|
| if (idResults && !idResults->isEmpty())
|
| return idResults->first();
|
|
|
| - WillBeHeapVector<RawPtrWillBeMember<Element>>* nameResults = cache.getElementsByName(name);
|
| + HeapVector<Member<Element>>* nameResults = cache.getElementsByName(name);
|
| if (nameResults && !nameResults->isEmpty())
|
| return nameResults->first();
|
|
|
| @@ -456,7 +456,7 @@ void HTMLCollection::updateIdNameCache() const
|
| if (hasValidIdNameCache())
|
| return;
|
|
|
| - OwnPtrWillBeRawPtr<NamedItemCache> cache = NamedItemCache::create();
|
| + RawPtr<NamedItemCache> cache = NamedItemCache::create();
|
| unsigned length = this->length();
|
| for (unsigned i = 0; i < length; ++i) {
|
| Element* element = item(i);
|
| @@ -473,7 +473,7 @@ void HTMLCollection::updateIdNameCache() const
|
| setNamedItemCache(cache.release());
|
| }
|
|
|
| -void HTMLCollection::namedItems(const AtomicString& name, WillBeHeapVector<RefPtrWillBeMember<Element>>& result) const
|
| +void HTMLCollection::namedItems(const AtomicString& name, HeapVector<Member<Element>>& result) const
|
| {
|
| ASSERT(result.isEmpty());
|
| if (name.isEmpty())
|
| @@ -482,11 +482,11 @@ void HTMLCollection::namedItems(const AtomicString& name, WillBeHeapVector<RefPt
|
| updateIdNameCache();
|
|
|
| const NamedItemCache& cache = namedItemCache();
|
| - if (WillBeHeapVector<RawPtrWillBeMember<Element>>* idResults = cache.getElementsById(name)) {
|
| + if (HeapVector<Member<Element>>* idResults = cache.getElementsById(name)) {
|
| for (unsigned i = 0; i < idResults->size(); ++i)
|
| result.append(idResults->at(i));
|
| }
|
| - if (WillBeHeapVector<RawPtrWillBeMember<Element>>* nameResults = cache.getElementsByName(name)) {
|
| + if (HeapVector<Member<Element>>* nameResults = cache.getElementsByName(name)) {
|
| for (unsigned i = 0; i < nameResults->size(); ++i)
|
| result.append(nameResults->at(i));
|
| }
|
|
|