Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderText.h

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004-2009, 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.
  *
  * 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 RenderText_h
 #define RenderText_h
 
 #include "core/dom/Text.h"
+#include "core/layout/LayoutObject.h"
 #include "core/layout/line/FloatToLayoutUnit.h"
-#include "core/rendering/RenderObject.h"
 #include "platform/LengthFunctions.h"
 #include "platform/text/TextPath.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 class AbstractInlineTextBox;
 class InlineTextBox;
 
-class RenderText : public RenderObject {
+class RenderText : public LayoutObject {
 public:
     // FIXME: If the node argument is not a Text node or the string argument is
     // not the content of the Text node, updating text-transform property
     // doesn't re-transform the string.
     RenderText(Node*, PassRefPtr<StringImpl>);
 #if ENABLE(ASSERT)
     virtual ~RenderText();
 #endif
 
     virtual const char* renderName() const override;
@@ skipping 107 matching lines @@
     virtual void invalidateDisplayItemClients(DisplayItemList*) const override;
 
 private:
     void computePreferredLogicalWidths(float leadWidth);
     void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
 
     bool computeCanUseSimpleFontCodePath() const;
 
     // Make length() private so that callers that have a RenderText*
     // will use the more efficient textLength() instead, while
-    // callers with a RenderObject* can continue to use length().
+    // callers with a LayoutObject* can continue to use length().
     virtual unsigned length() const override final { return textLength(); }
 
     virtual void paint(const PaintInfo&, const LayoutPoint&) override final { ASSERT_NOT_REACHED(); }
     virtual void layout() override final { ASSERT_NOT_REACHED(); }
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) override final { ASSERT_NOT_REACHED(); return false; }
 
     void deleteTextBoxes();
     bool containsOnlyWhitespace(unsigned from, unsigned len) const;
     float widthFromCache(const Font&, int start, int len, float xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow*) const;
     bool isAllASCII() const { return m_isAllASCII; }
@@ skipping 40 matching lines @@
 }
 
 inline UChar RenderText::characterAt(unsigned i) const
 {
     if (i >= textLength())
         return 0;
 
     return uncheckedCharacterAt(i);
 }
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderText, isText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderText, isText());
 
 #if !ENABLE(ASSERT)
 inline void RenderText::checkConsistency() const
 {
 }
 #endif
 
 inline RenderText* Text::renderer() const
 {
     return toRenderText(CharacterData::renderer());
 }
 
 void applyTextTransform(const RenderStyle*, String&, UChar);
 
 } // namespace blink
 
 #endif // RenderText_h