| Index: third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
|
| index 51b0416bf8fb74338ed0b023730c6417fa0e2a27..1648b2ace7d08250e7dfb6e14c963c38ff2f3824 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.cpp
|
| @@ -78,7 +78,7 @@ HTMLFormattingElementList::Bookmark HTMLFormattingElementList::bookmarkFor(Eleme
|
| return Bookmark(&at(index));
|
| }
|
|
|
| -void HTMLFormattingElementList::swapTo(Element* oldElement, PassRefPtrWillBeRawPtr<HTMLStackItem> newItem, const Bookmark& bookmark)
|
| +void HTMLFormattingElementList::swapTo(Element* oldElement, RawPtr<HTMLStackItem> newItem, const Bookmark& bookmark)
|
| {
|
| ASSERT(contains(oldElement));
|
| ASSERT(!contains(newItem->element()));
|
| @@ -93,7 +93,7 @@ void HTMLFormattingElementList::swapTo(Element* oldElement, PassRefPtrWillBeRawP
|
| remove(oldElement);
|
| }
|
|
|
| -void HTMLFormattingElementList::append(PassRefPtrWillBeRawPtr<HTMLStackItem> item)
|
| +void HTMLFormattingElementList::append(RawPtr<HTMLStackItem> item)
|
| {
|
| ensureNoahsArkCondition(item.get());
|
| m_entries.append(item);
|
| @@ -122,7 +122,7 @@ void HTMLFormattingElementList::clearToLastMarker()
|
| }
|
| }
|
|
|
| -void HTMLFormattingElementList::tryToEnsureNoahsArkConditionQuickly(HTMLStackItem* newItem, WillBeHeapVector<RawPtrWillBeMember<HTMLStackItem>>& remainingCandidates)
|
| +void HTMLFormattingElementList::tryToEnsureNoahsArkConditionQuickly(HTMLStackItem* newItem, HeapVector<Member<HTMLStackItem>>& remainingCandidates)
|
| {
|
| ASSERT(remainingCandidates.isEmpty());
|
|
|
| @@ -131,7 +131,7 @@ void HTMLFormattingElementList::tryToEnsureNoahsArkConditionQuickly(HTMLStackIte
|
|
|
| // Use a vector with inline capacity to avoid a malloc in the common case
|
| // of a quickly ensuring the condition.
|
| - WillBeHeapVector<RawPtrWillBeMember<HTMLStackItem>, 10> candidates;
|
| + HeapVector<Member<HTMLStackItem>, 10> candidates;
|
|
|
| size_t newItemAttributeCount = newItem->attributes().size();
|
|
|
| @@ -159,14 +159,14 @@ void HTMLFormattingElementList::tryToEnsureNoahsArkConditionQuickly(HTMLStackIte
|
|
|
| void HTMLFormattingElementList::ensureNoahsArkCondition(HTMLStackItem* newItem)
|
| {
|
| - WillBeHeapVector<RawPtrWillBeMember<HTMLStackItem>> candidates;
|
| + HeapVector<Member<HTMLStackItem>> candidates;
|
| tryToEnsureNoahsArkConditionQuickly(newItem, candidates);
|
| if (candidates.isEmpty())
|
| return;
|
|
|
| // We pre-allocate and re-use this second vector to save one malloc per
|
| // attribute that we verify.
|
| - WillBeHeapVector<RawPtrWillBeMember<HTMLStackItem>> remainingCandidates;
|
| + HeapVector<Member<HTMLStackItem>> remainingCandidates;
|
| remainingCandidates.reserveInitialCapacity(candidates.size());
|
|
|
| const Vector<Attribute>& attributes = newItem->attributes();
|
|
|