| Index: third_party/WebKit/Source/core/dom/NodeIterator.h
|
| diff --git a/third_party/WebKit/Source/core/dom/NodeIterator.h b/third_party/WebKit/Source/core/dom/NodeIterator.h
|
| index 4a0b5be5964d27d78d6264748dbaad9fa860e0c0..6c6e4163bf7094d935ee840bf6d194480c16c384 100644
|
| --- a/third_party/WebKit/Source/core/dom/NodeIterator.h
|
| +++ b/third_party/WebKit/Source/core/dom/NodeIterator.h
|
| @@ -36,21 +36,21 @@ namespace blink {
|
|
|
| class ExceptionState;
|
|
|
| -class NodeIterator final : public RefCountedWillBeGarbageCollected<NodeIterator>, public ScriptWrappable, public NodeIteratorBase {
|
| +class NodeIterator final : public GarbageCollected<NodeIterator>, public ScriptWrappable, public NodeIteratorBase {
|
| DEFINE_WRAPPERTYPEINFO();
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NodeIterator);
|
| + USING_GARBAGE_COLLECTED_MIXIN(NodeIterator);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<NodeIterator> create(PassRefPtrWillBeRawPtr<Node> rootNode, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter> filter)
|
| + static RawPtr<NodeIterator> create(RawPtr<Node> rootNode, unsigned whatToShow, RawPtr<NodeFilter> filter)
|
| {
|
| - return adoptRefWillBeNoop(new NodeIterator(rootNode, whatToShow, filter));
|
| + return new NodeIterator(rootNode, whatToShow, filter);
|
| }
|
|
|
| #if !ENABLE(OILPAN)
|
| ~NodeIterator();
|
| #endif
|
|
|
| - PassRefPtrWillBeRawPtr<Node> nextNode(ExceptionState&);
|
| - PassRefPtrWillBeRawPtr<Node> previousNode(ExceptionState&);
|
| + RawPtr<Node> nextNode(ExceptionState&);
|
| + RawPtr<Node> previousNode(ExceptionState&);
|
| void detach();
|
|
|
| Node* referenceNode() const { return m_referenceNode.node.get(); }
|
| @@ -62,19 +62,19 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - NodeIterator(PassRefPtrWillBeRawPtr<Node>, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter>);
|
| + NodeIterator(RawPtr<Node>, unsigned whatToShow, RawPtr<NodeFilter>);
|
|
|
| class NodePointer {
|
| DISALLOW_NEW();
|
| public:
|
| NodePointer();
|
| - NodePointer(PassRefPtrWillBeRawPtr<Node>, bool);
|
| + NodePointer(RawPtr<Node>, bool);
|
|
|
| void clear();
|
| bool moveToNext(Node* root);
|
| bool moveToPrevious(Node* root);
|
|
|
| - RefPtrWillBeMember<Node> node;
|
| + Member<Node> node;
|
| bool isPointerBeforeNode;
|
|
|
| DEFINE_INLINE_TRACE()
|
|
|