inline WebCore::Node::Node constructor more safely

Source/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 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef ContainerNode_h
 #define ContainerNode_h
 
 #include "core/dom/ExceptionCodePlaceholder.h"
 #include "core/dom/Node.h"
+#include "core/dom/TreeScope.h"

[adamk, 2013/06/04 23:08:08]

No need for an #include here

[Mostyn Bramley-Moore, 2013/06/04 23:46:07]

Done.

 
 #include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class FloatPoint;
 class HTMLCollection;
 
 typedef void (*NodeCallback)(Node*);
@@ skipping 92 matching lines @@
     void detachChildren();
     void detachChildrenIfNeeded();
 
     void disconnectDescendantFrames();
 
     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const { return true; }
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 protected:
-    ContainerNode(Document*, ConstructionType = CreateContainer);
+    ContainerNode(TreeScope*, ConstructionType = CreateContainer);
 
     static void queuePostAttachCallback(NodeCallback, Node*);
     static bool postAttachCallbacksAreSuspended();
 
     template<class GenericNode, class GenericNodeContainer>
     friend void appendChildToContainer(GenericNode* child, GenericNodeContainer*);
 
     template<class GenericNode, class GenericNodeContainer>
     friend void Private::addChildNodesToDeletionQueue(GenericNode*& head, GenericNode*& tail, GenericNodeContainer*);
 
@@ skipping 25 matching lines @@
 
 inline const ContainerNode* toContainerNode(const Node* node)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isContainerNode());
     return static_cast<const ContainerNode*>(node);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toContainerNode(const ContainerNode*);
 
-inline ContainerNode::ContainerNode(Document* document, ConstructionType type)
-    : Node(document, type)
+inline ContainerNode::ContainerNode(TreeScope* tree_scope, ConstructionType type)

[adamk, 2013/06/04 23:08:08]

tree_scope -> treeScope

[Mostyn Bramley-Moore, 2013/06/04 23:46:07]

Done.

+    : Node(tree_scope, type)
     , m_firstChild(0)
     , m_lastChild(0)
 {
 }
 
 inline void ContainerNode::attachChildren()
 {
     for (Node* child = firstChild(); child; child = child->nextSibling()) {
         ASSERT(!child->attached() || childAttachedAllowedWhenAttachingChildren(this));
         if (!child->attached())
@@ skipping 159 matching lines @@
         m_node->resumePostAttachCallbacks();
     }
 
 private:
     ContainerNode* m_node;
 };
 
 } // namespace WebCore
 
 #endif // ContainerNode_h