| Index: third_party/WebKit/Source/core/dom/NodeIteratorBase.h
|
| diff --git a/third_party/WebKit/Source/core/dom/NodeIteratorBase.h b/third_party/WebKit/Source/core/dom/NodeIteratorBase.h
|
| index fdd82ec28c36d8d6d3276cababfdd402a45ff7d8..c5915d0be5d3dee266a81036073e9c1e4b4c83e7 100644
|
| --- a/third_party/WebKit/Source/core/dom/NodeIteratorBase.h
|
| +++ b/third_party/WebKit/Source/core/dom/NodeIteratorBase.h
|
| @@ -34,8 +34,7 @@ class ExceptionState;
|
| class Node;
|
| class NodeFilter;
|
|
|
| -class NodeIteratorBase : public WillBeGarbageCollectedMixin {
|
| - DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NodeIteratorBase);
|
| +class NodeIteratorBase : public GarbageCollectedMixin {
|
| public:
|
| Node* root() const { return m_root.get(); }
|
| unsigned whatToShow() const { return m_whatToShow; }
|
| @@ -44,13 +43,13 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| protected:
|
| - NodeIteratorBase(PassRefPtrWillBeRawPtr<Node>, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter>);
|
| + NodeIteratorBase(RawPtr<Node>, unsigned whatToShow, RawPtr<NodeFilter>);
|
| unsigned acceptNode(Node*, ExceptionState&) const;
|
|
|
| private:
|
| - RefPtrWillBeMember<Node> m_root;
|
| + Member<Node> m_root;
|
| unsigned m_whatToShow;
|
| - RefPtrWillBeMember<NodeFilter> m_filter;
|
| + Member<NodeFilter> m_filter;
|
| };
|
|
|
| } // namespace blink
|
|
|