| Index: third_party/WebKit/Source/core/dom/ContainerNode.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.h b/third_party/WebKit/Source/core/dom/ContainerNode.h
|
| index e25dbd816a4a494ffef0fef376f24d89c6e60dd4..e4e7c4bbd7312278afdd2a37337158c1203b1df3 100644
|
| --- a/third_party/WebKit/Source/core/dom/ContainerNode.h
|
| +++ b/third_party/WebKit/Source/core/dom/ContainerNode.h
|
| @@ -66,7 +66,7 @@ enum SubtreeModificationAction {
|
| // for a Node Vector that is used to store child Nodes of a given Node.
|
| // FIXME: Optimize the value.
|
| const int initialNodeVectorSize = 11;
|
| -using NodeVector = WillBeHeapVector<RefPtrWillBeMember<Node>, initialNodeVectorSize>;
|
| +using NodeVector = HeapVector<Member<Node>, initialNodeVectorSize>;
|
|
|
| class CORE_EXPORT ContainerNode : public Node {
|
| public:
|
| @@ -80,30 +80,30 @@ public:
|
| bool hasOneTextChild() const { return hasOneChild() && m_firstChild->isTextNode(); }
|
| bool hasChildCount(unsigned) const;
|
|
|
| - PassRefPtrWillBeRawPtr<HTMLCollection> children();
|
| + RawPtr<HTMLCollection> children();
|
|
|
| unsigned countChildren() const;
|
|
|
| - PassRefPtrWillBeRawPtr<Element> querySelector(const AtomicString& selectors, ExceptionState&);
|
| - PassRefPtrWillBeRawPtr<StaticElementList> querySelectorAll(const AtomicString& selectors, ExceptionState&);
|
| + RawPtr<Element> querySelector(const AtomicString& selectors, ExceptionState&);
|
| + RawPtr<StaticElementList> querySelectorAll(const AtomicString& selectors, ExceptionState&);
|
|
|
| - PassRefPtrWillBeRawPtr<Node> insertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node* refChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| - PassRefPtrWillBeRawPtr<Node> replaceChild(PassRefPtrWillBeRawPtr<Node> newChild, PassRefPtrWillBeRawPtr<Node> oldChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| - PassRefPtrWillBeRawPtr<Node> removeChild(PassRefPtrWillBeRawPtr<Node> child, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| - PassRefPtrWillBeRawPtr<Node> appendChild(PassRefPtrWillBeRawPtr<Node> newChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| + RawPtr<Node> insertBefore(RawPtr<Node> newChild, Node* refChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| + RawPtr<Node> replaceChild(RawPtr<Node> newChild, RawPtr<Node> oldChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| + RawPtr<Node> removeChild(RawPtr<Node> child, ExceptionState& = ASSERT_NO_EXCEPTION);
|
| + RawPtr<Node> appendChild(RawPtr<Node> newChild, ExceptionState& = ASSERT_NO_EXCEPTION);
|
|
|
| Element* getElementById(const AtomicString& id) const;
|
| - PassRefPtrWillBeRawPtr<TagCollection> getElementsByTagName(const AtomicString&);
|
| - PassRefPtrWillBeRawPtr<TagCollection> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
|
| - PassRefPtrWillBeRawPtr<NameNodeList> getElementsByName(const AtomicString& elementName);
|
| - PassRefPtrWillBeRawPtr<ClassCollection> getElementsByClassName(const AtomicString& classNames);
|
| - PassRefPtrWillBeRawPtr<RadioNodeList> radioNodeList(const AtomicString&, bool onlyMatchImgElements = false);
|
| + RawPtr<TagCollection> getElementsByTagName(const AtomicString&);
|
| + RawPtr<TagCollection> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
|
| + RawPtr<NameNodeList> getElementsByName(const AtomicString& elementName);
|
| + RawPtr<ClassCollection> getElementsByClassName(const AtomicString& classNames);
|
| + RawPtr<RadioNodeList> radioNodeList(const AtomicString&, bool onlyMatchImgElements = false);
|
|
|
| // These methods are only used during parsing.
|
| // They don't send DOM mutation events or accept DocumentFragments.
|
| - void parserAppendChild(PassRefPtrWillBeRawPtr<Node>);
|
| + void parserAppendChild(RawPtr<Node>);
|
| void parserRemoveChild(Node&);
|
| - void parserInsertBefore(PassRefPtrWillBeRawPtr<Node> newChild, Node& refChild);
|
| + void parserInsertBefore(RawPtr<Node> newChild, Node& refChild);
|
| void parserTakeAllChildrenFrom(ContainerNode&);
|
|
|
| void removeChildren(SubtreeModificationAction = DispatchSubtreeModifiedEvent);
|
| @@ -199,8 +199,8 @@ public:
|
| bool isChildElementChange() const { return type == ElementInserted || type == ElementRemoved; }
|
|
|
| ChildrenChangeType type;
|
| - RawPtrWillBeMember<Node> siblingBeforeChange;
|
| - RawPtrWillBeMember<Node> siblingAfterChange;
|
| + Member<Node> siblingBeforeChange;
|
| + Member<Node> siblingAfterChange;
|
| ChildrenChangeSource byParser;
|
| };
|
|
|
| @@ -223,9 +223,9 @@ protected:
|
| void setLastChild(Node* child) { m_lastChild = child; }
|
|
|
| // Utility functions for NodeListsNodeData API.
|
| - template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType);
|
| - template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& name);
|
| - template <typename Collection> PassRefPtrWillBeRawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& namespaceURI, const AtomicString& localName);
|
| + template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType);
|
| + template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& name);
|
| + template <typename Collection> RawPtr<Collection> ensureCachedCollection(CollectionType, const AtomicString& namespaceURI, const AtomicString& localName);
|
| template <typename Collection> Collection* cachedCollection(CollectionType);
|
|
|
| private:
|
| @@ -261,8 +261,8 @@ private:
|
| bool getUpperLeftCorner(FloatPoint&) const;
|
| bool getLowerRightCorner(FloatPoint&) const;
|
|
|
| - RawPtrWillBeMember<Node> m_firstChild;
|
| - RawPtrWillBeMember<Node> m_lastChild;
|
| + Member<Node> m_firstChild;
|
| + Member<Node> m_lastChild;
|
| };
|
|
|
| #if ENABLE(ASSERT)
|
|
|