Rename RenderText to LayoutText

Source/core/layout/LayoutCombineText.h

Index: Source/core/layout/LayoutCombineText.h
diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/layout/LayoutCombineText.h
similarity index 82%
rename from Source/core/rendering/RenderCombineText.h
rename to Source/core/layout/LayoutCombineText.h
index b41b082327a2e57e9f997c035d4bc6a257e8e7ac..7f43fe8e3e169a35f32cc0da5d471dc1702bed9d 100644
--- a/Source/core/rendering/RenderCombineText.h
+++ b/Source/core/layout/LayoutCombineText.h
@@ -18,20 +18,20 @@
  *
  */
 
-#ifndef RenderCombineText_h
-#define RenderCombineText_h
+#ifndef LayoutCombineText_h
+#define LayoutCombineText_h
 
-#include "core/rendering/RenderText.h"
+#include "core/layout/LayoutText.h"
 #include "platform/fonts/Font.h"
 
 namespace blink {
 
-// RenderCombineText uses different coordinate systems for layout and inlineTextBox,
+// LayoutCombineText uses different coordinate systems for layout and inlineTextBox,
 // because it is treated as 1em-box character in vertical flow for the layout,
 // while its inline box is in horizontal flow.
-class RenderCombineText final : public RenderText {
+class LayoutCombineText final : public LayoutText {

[dsinclair, 2015/02/26 14:25:26]

Can we make this LayoutTextCombine to be consistent with LayoutText and
LayoutTextFragment? This was discussed on blink-dev and there were no
objections.

[eae, 2015/02/26 17:48:54]

Sure, will do.

 public:
-    RenderCombineText(Node*, PassRefPtr<StringImpl>);
+    LayoutCombineText(Node*, PassRefPtr<StringImpl>);
 
     void updateFont();
     bool isCombined() const { return m_isCombined; }
@@ -59,21 +59,21 @@ private:
     bool m_needsFontUpdate : 1;
 };
 
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutCombineText, isCombineText());
 
-inline float RenderCombineText::inlineWidthForLayout() const
+inline float LayoutCombineText::inlineWidthForLayout() const
 {
     ASSERT(!m_needsFontUpdate);
     return m_combinedTextWidth;
 }
 
-inline float RenderCombineText::offsetX(const FloatRect& boxRect) const
+inline float LayoutCombineText::offsetX(const FloatRect& boxRect) const
 {
     ASSERT(!m_needsFontUpdate);
     return (boxRect.height() - m_combinedTextWidth / m_scaleX) / 2;
 }
 
-inline float RenderCombineText::offsetXNoScale(const FloatRect& boxRect) const
+inline float LayoutCombineText::offsetXNoScale(const FloatRect& boxRect) const
 {
     ASSERT(!m_needsFontUpdate);
     return (boxRect.height() - m_combinedTextWidth) / 2;
@@ -82,4 +82,4 @@ inline float RenderCombineText::offsetXNoScale(const FloatRect& boxRect) const
 
 } // namespace blink
 
-#endif // RenderCombineText_h
+#endif // LayoutCombineText_h