inline WebCore::Node::Node constructor more safely

Source/core/dom/CharacterData.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 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 CharacterData_h
 #define CharacterData_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/text/WTFString.h>
 
 namespace WebCore {
 
 class CharacterData : public Node {
 public:
     String data() const { return m_data; }
     void setData(const String&, ExceptionCode&);
     unsigned length() const { return m_data.length(); }
     String substringData(unsigned offset, unsigned count, ExceptionCode&);
     void appendData(const String&, ExceptionCode&);
     void insertData(unsigned offset, const String&, ExceptionCode&);
     void deleteData(unsigned offset, unsigned count, ExceptionCode&);
     void replaceData(unsigned offset, unsigned count, const String&, ExceptionCode&);
 
     bool containsOnlyWhitespace() const;
 
     StringImpl* dataImpl() { return m_data.impl(); }
 
     // Like appendData, but optimized for the parser (e.g., no mutation events).
     // Returns how much could be added before length limit was met.
     unsigned parserAppendData(const String& string, unsigned offset, unsigned lengthLimit);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const;
 
 protected:
-    CharacterData(Document* document, const String& text, ConstructionType type)
-        : Node(document, type)
+    CharacterData(TreeScope* tree_scope, const String& text, 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_data(!text.isNull() ? text : emptyString())
     {
         ASSERT(type == CreateOther || type == CreateText || type == CreateEditingText);
         ScriptWrappable::init(this);
     }
 
     void setDataWithoutUpdate(const String& data)
     {
         ASSERT(!data.isNull());
         m_data = data;
     }
     void dispatchModifiedEvent(const String& oldValue);
 
 private:
     virtual String nodeValue() const OVERRIDE FINAL;
     virtual void setNodeValue(const String&, ExceptionCode&) OVERRIDE FINAL;
     virtual bool isCharacterDataNode() const OVERRIDE FINAL { return true; }
     virtual int maxCharacterOffset() const OVERRIDE FINAL;
     virtual bool offsetInCharacters() const OVERRIDE FINAL;
     void setDataAndUpdate(const String&, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength);
     void checkCharDataOperation(unsigned offset, ExceptionCode&);
 
     String m_data;
 };
 
 } // namespace WebCore
 
 #endif // CharacterData_h