| Index: third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.h
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.h b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.h
|
| index 118a21ff05baa69dcf0a432bc4590ce9145cd1f7..9dd3a1e08f63d8c404701e317644167e988833ba 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.h
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLFormattingElementList.h
|
| @@ -50,7 +50,7 @@ public:
|
| DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| public:
|
| // Inline because they're hot and Vector<T> uses them.
|
| - explicit Entry(PassRefPtrWillBeRawPtr<HTMLStackItem> item)
|
| + explicit Entry(RawPtr<HTMLStackItem> item)
|
| : m_item(item)
|
| {
|
| }
|
| @@ -63,7 +63,7 @@ public:
|
|
|
| bool isMarker() const { return !m_item; }
|
|
|
| - PassRefPtrWillBeRawPtr<HTMLStackItem> stackItem() const { return m_item; }
|
| + RawPtr<HTMLStackItem> stackItem() const { return m_item; }
|
| Element* element() const
|
| {
|
| // The fact that !m_item == isMarker() is an implementation detail
|
| @@ -71,7 +71,7 @@ public:
|
| ASSERT(m_item);
|
| return m_item->element();
|
| }
|
| - void replaceElement(PassRefPtrWillBeRawPtr<HTMLStackItem> item) { m_item = item; }
|
| + void replaceElement(RawPtr<HTMLStackItem> item) { m_item = item; }
|
|
|
| // Needed for use with Vector. These are super-hot and must be inline.
|
| bool operator==(Element* element) const { return !m_item ? !element : m_item->element() == element; }
|
| @@ -80,7 +80,7 @@ public:
|
| DEFINE_INLINE_TRACE() { visitor->trace(m_item); }
|
|
|
| private:
|
| - RefPtrWillBeMember<HTMLStackItem> m_item;
|
| + Member<HTMLStackItem> m_item;
|
| };
|
|
|
| class Bookmark {
|
| @@ -113,11 +113,11 @@ public:
|
|
|
| Entry* find(Element*);
|
| bool contains(Element*);
|
| - void append(PassRefPtrWillBeRawPtr<HTMLStackItem>);
|
| + void append(RawPtr<HTMLStackItem>);
|
| void remove(Element*);
|
|
|
| Bookmark bookmarkFor(Element*);
|
| - void swapTo(Element* oldElement, PassRefPtrWillBeRawPtr<HTMLStackItem> newItem, const Bookmark&);
|
| + void swapTo(Element* oldElement, RawPtr<HTMLStackItem> newItem, const Bookmark&);
|
|
|
| void appendMarker();
|
| // clearToLastMarker also clears the marker (per the HTML5 spec).
|
| @@ -142,10 +142,10 @@ private:
|
|
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#list-of-active-formatting-elements
|
| // These functions enforce the "Noah's Ark" condition, which removes redundant mis-nested elements.
|
| - void tryToEnsureNoahsArkConditionQuickly(HTMLStackItem*, WillBeHeapVector<RawPtrWillBeMember<HTMLStackItem>>& remainingCandiates);
|
| + void tryToEnsureNoahsArkConditionQuickly(HTMLStackItem*, HeapVector<Member<HTMLStackItem>>& remainingCandiates);
|
| void ensureNoahsArkCondition(HTMLStackItem*);
|
|
|
| - WillBeHeapVector<Entry> m_entries;
|
| + HeapVector<Entry> m_entries;
|
| };
|
|
|
| } // namespace blink
|
|
|