Remove more API from Node and ContainerNode.

sky/engine/core/dom/ContainerNode.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 34 matching lines @@
 class ContainerNode : public Node {
 public:
     virtual ~ContainerNode();
 
     Node* firstChild() const { return m_firstChild; }
     Node* lastChild() const { return m_lastChild; }
     bool hasChildren() const { return m_firstChild; }
 
     bool hasOneChild() const { return m_firstChild && !m_firstChild->nextSibling(); }
     bool hasOneTextChild() const { return hasOneChild() && m_firstChild->isTextNode(); }
-    bool hasChildCount(unsigned) const;
 
     unsigned countChildren() const;
 
     PassRefPtr<Element> querySelector(const AtomicString& selectors, ExceptionState&);
     PassRefPtr<StaticElementList> querySelectorAll(const AtomicString& selectors, ExceptionState&);
 
     PassRefPtr<Node> insertBefore(PassRefPtr<Node> newChild, Node* refChild, ExceptionState& = ASSERT_NO_EXCEPTION);
     PassRefPtr<Node> replaceChild(PassRefPtr<Node> newChild, PassRefPtr<Node> oldChild, ExceptionState& = ASSERT_NO_EXCEPTION);
     PassRefPtr<Node> removeChild(PassRefPtr<Node> child, ExceptionState& = ASSERT_NO_EXCEPTION);
     PassRefPtr<Node> appendChild(PassRefPtr<Node> newChild, ExceptionState& = ASSERT_NO_EXCEPTION);
 
     Element* getElementById(const AtomicString& id) const;
 
     // These methods are only used during parsing.
     // They don't send DOM mutation events or handle reparenting.
     void parserAppendChild(PassRefPtr<Node>);
     void parserRemoveChild(Node&);
     void parserInsertBefore(PassRefPtr<Node> newChild, Node& refChild);
-    void parserTakeAllChildrenFrom(ContainerNode&);
 
     void removeChildren();
 
     void cloneChildNodes(ContainerNode* clone);
 
     virtual void attach(const AttachContext& = AttachContext()) override;
     virtual void detach(const AttachContext& = AttachContext()) override;
     virtual LayoutRect boundingBox() const override final;
     virtual void setFocus(bool) override;
     void focusStateChanged();
     virtual void setActive(bool = true) override;
     virtual void setHovered(bool = true) override;
 
     // -----------------------------------------------------------------------------
     // Notification of document structure changes (see core/dom/Node.h for more notification methods)
 
     enum ChildrenChangeType { ElementInserted, NonElementInserted, ElementRemoved, NonElementRemoved, AllChildrenRemoved, TextChanged };
     enum ChildrenChangeSource { ChildrenChangeSourceAPI, ChildrenChangeSourceParser };
     struct ChildrenChange {
         STACK_ALLOCATED();
     public:
         static ChildrenChange forInsertion(Node& node, ChildrenChangeSource byParser)
         {
             ChildrenChange change = {
                 node.isElementNode() ? ElementInserted : NonElementInserted,
-                node.previousSibling(),
-                node.nextSibling(),
                 byParser
             };
             return change;
         }
 
-        static ChildrenChange forRemoval(Node& node, Node* previousSibling, Node* nextSibling, ChildrenChangeSource byParser)
+        static ChildrenChange forRemoval(Node& node, ChildrenChangeSource byParser)
         {
             ChildrenChange change = {
                 node.isElementNode() ? ElementRemoved : NonElementRemoved,
-                previousSibling,
-                nextSibling,
                 byParser
             };
             return change;
         }
 
         bool isChildInsertion() const { return type == ElementInserted || type == NonElementInserted; }
-        bool isChildRemoval() const { return type == ElementRemoved || type == NonElementRemoved; }
-        bool isChildElementChange() const { return type == ElementInserted || type == ElementRemoved; }
 
         ChildrenChangeType type;
-        RawPtr<Node> siblingBeforeChange;
-        RawPtr<Node> siblingAfterChange;
         ChildrenChangeSource byParser;
     };
 
     // Notifies the node that it's list of children have changed (either by adding or removing child nodes), or a child
     // node that is of the type TEXT_NODE has changed its value.
     virtual void childrenChanged(const ChildrenChange&);
 
-    virtual void trace(Visitor*) override;
-
 protected:
     ContainerNode(TreeScope*, ConstructionType = CreateContainer);
 
-#if !ENABLE(OILPAN)
     void removeDetachedChildren();
-#endif
 
     void setFirstChild(Node* child) { m_firstChild = child; }
     void setLastChild(Node* child) { m_lastChild = child; }
 
 private:
     bool isContainerNode() const = delete; // This will catch anyone doing an unnecessary check.
     bool isTextNode() const = delete; // This will catch anyone doing an unnecessary check.
 
     void removeBetween(Node* previousChild, Node* nextChild, Node& oldChild);
     void insertBeforeCommon(Node& nextChild, Node& oldChild);
@@ skipping 22 matching lines @@
     RawPtr<Node> m_firstChild;
     RawPtr<Node> m_lastChild;
 };
 
 #if ENABLE(ASSERT)
 bool childAttachedAllowedWhenAttachingChildren(ContainerNode*);
 #endif
 
 DEFINE_NODE_TYPE_CASTS(ContainerNode, isContainerNode());
 
-inline bool ContainerNode::hasChildCount(unsigned count) const
-{
-    Node* child = m_firstChild;
-    while (count && child) {
-        child = child->nextSibling();
-        --count;
-    }
-    return !count && !child;
-}
-
 inline ContainerNode::ContainerNode(TreeScope* treeScope, ConstructionType type)
     : Node(treeScope, type)
     , m_firstChild(nullptr)
     , m_lastChild(nullptr)
 {
 }
 
 inline void ContainerNode::attachChildren(const AttachContext& context)
 {
     AttachContext childrenContext(context);
@@ skipping 56 matching lines @@
 inline void getChildNodes(ContainerNode& node, NodeVector& nodes)
 {
     ASSERT(!nodes.size());
     for (Node* child = node.firstChild(); child; child = child->nextSibling())
         nodes.append(child);
 }
 
 } // namespace blink
 
 #endif // ContainerNode_h