Rename RenderText to LayoutText

Source/core/layout/LayoutText.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
+#ifndef LayoutText_h
+#define LayoutText_h
 
 #include "core/dom/Text.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/line/FloatToLayoutUnit.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 LayoutObject {
+class LayoutText : 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>);
+    LayoutText(Node*, PassRefPtr<StringImpl>);
 #if ENABLE(ASSERT)
-    virtual ~RenderText();
+    virtual ~LayoutText();
 #endif
 
     virtual const char* renderName() const override;
 
     virtual bool isTextFragment() const;
     virtual bool isWordBreak() const;
 
     virtual PassRefPtr<StringImpl> originalText() const;
 
     void extractTextBox(InlineTextBox*);
@@ skipping 98 matching lines @@
     virtual InlineTextBox* createTextBox(int start, unsigned short length); // Subclassed by SVG.
 
     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*
+    // Make length() private so that callers that have a LayoutText*
     // will use the more efficient textLength() instead, while
     // 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; }
 
     void secureText(UChar mask);
 
     bool isText() const = delete; // This will catch anyone doing an unnecessary check.
 
     virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
 
     void checkConsistency() const;
 
     // We put the bitfield first to minimize padding on 64-bit.
     bool m_hasBreakableChar : 1; // Whether or not we can be broken into multiple lines.
     bool m_hasBreak : 1; // Whether or not we have a hard break (e.g., <pre> with '\n').
     bool m_hasTab : 1; // Whether or not we have a variable width tab character (e.g., <pre> with '\t').
     bool m_hasBreakableStart : 1;
     bool m_hasBreakableEnd : 1;
     bool m_hasEndWhiteSpace : 1;
-    bool m_linesDirty : 1; // This bit indicates that the text run has already dirtied specific
-                           // line boxes, and this hint will enable layoutInlineChildren to avoid
-                           // just dirtying everything when character data is modified (e.g., appended/inserted
-                           // or removed).
+    // This bit indicates that the text run has already dirtied specific
+    // line boxes, and this hint will enable layoutInlineChildren to avoid
+    // just dirtying everything when character data is modified (e.g., appended/inserted
+    // or removed).
+    bool m_linesDirty : 1;
     bool m_containsReversedText : 1;
     bool m_isAllASCII : 1;
     bool m_canUseSimpleFontCodePath : 1;
     mutable bool m_knownToHaveNoOverflowAndNoFallbackFonts : 1;
 
     float m_minWidth;
     float m_maxWidth;
     float m_firstLineMinWidth;
     float m_lastLineLineMinWidth;
 
     String m_text;
 
     InlineTextBox* m_firstTextBox;
     InlineTextBox* m_lastTextBox;
 };
 
-inline UChar RenderText::uncheckedCharacterAt(unsigned i) const
+inline UChar LayoutText::uncheckedCharacterAt(unsigned i) const
 {
     ASSERT_WITH_SECURITY_IMPLICATION(i < textLength());
     return is8Bit() ? characters8()[i] : characters16()[i];
 }
 
-inline UChar RenderText::characterAt(unsigned i) const
+inline UChar LayoutText::characterAt(unsigned i) const
 {
     if (i >= textLength())
         return 0;
 
     return uncheckedCharacterAt(i);
 }
 
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderText, isText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutText, isText());
 
 #if !ENABLE(ASSERT)
-inline void RenderText::checkConsistency() const
+inline void LayoutText::checkConsistency() const
 {
 }
 #endif
 
-inline RenderText* Text::renderer() const
+inline LayoutText* Text::renderer() const
 {
-    return toRenderText(CharacterData::renderer());
+    return toLayoutText(CharacterData::renderer());
 }
 
 void applyTextTransform(const LayoutStyle*, String&, UChar);
 
 } // namespace blink
 
-#endif // RenderText_h
+#endif // LayoutText_h