Rename RenderText to LayoutText

Source/core/layout/LayoutTextCombine.cpp

 /*
  * Copyright (C) 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.
  *
  */
 
 #include "config.h"
-#include "core/rendering/RenderCombineText.h"
+#include "core/layout/LayoutTextCombine.h"
 
 #include "core/layout/TextRunConstructor.h"
 #include "platform/graphics/GraphicsContext.h"
 
 namespace blink {
 
 const float textCombineMargin = 1.1f; // Allow em + 10% margin
 
-RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)
-    : RenderText(node, string)
+LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string)
+    : LayoutText(node, string)
     , m_combinedTextWidth(0)
     , m_scaleX(1.0f)
     , m_isCombined(false)
     , m_needsFontUpdate(false)
 {
 }
 
-void RenderCombineText::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutTextCombine::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
 {
     setStyleInternal(LayoutStyle::clone(styleRef()));
-    RenderText::styleDidChange(diff, oldStyle);
+    LayoutText::styleDidChange(diff, oldStyle);
 
     updateIsCombined();
 }
 
-void RenderCombineText::setTextInternal(PassRefPtr<StringImpl> text)
+void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
 {
-    RenderText::setTextInternal(text);
+    LayoutText::setTextInternal(text);
 
     updateIsCombined();
 }
 
-float RenderCombineText::width(unsigned from, unsigned length, const Font& font, float xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
+float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, float xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
 {
     if (!length)
         return 0;
 
     if (hasEmptyText())
         return 0;
 
     if (m_isCombined)
         return font.fontDescription().computedSize();
 
-    return RenderText::width(from, length, font, xPosition, direction, fallbackFonts, glyphOverflow);
+    return LayoutText::width(from, length, font, xPosition, direction, fallbackFonts, glyphOverflow);
 }
 
 void scaleHorizontallyAndTranslate(GraphicsContext& context, float scaleX, float centerX, float offsetX, float offsetY)
 {
     context.concatCTM(AffineTransform(scaleX, 0, 0, 1, centerX * (1.0f - scaleX) + offsetX * scaleX, offsetY));
 }
 
-void RenderCombineText::transformToInlineCoordinates(GraphicsContext& context, const FloatRect& boxRect) const
+void LayoutTextCombine::transformToInlineCoordinates(GraphicsContext& context, const FloatRect& boxRect) const
 {
     ASSERT(!m_needsFontUpdate);
     ASSERT(m_isCombined);
     if (m_scaleX >= 1.0f) {
         // Fast path, more than 90% of cases
         ASSERT(m_scaleX == 1.0f);
         context.concatCTM(AffineTransform::translation(offsetXNoScale(boxRect), offsetY()));
         return;
     }
     ASSERT(m_scaleX > 0.0f);
     const float centerX = boxRect.x() + boxRect.width() / 2;
     scaleHorizontallyAndTranslate(context, m_scaleX, centerX, offsetX(boxRect), offsetY());
 }
 
-void RenderCombineText::transformLayoutRect(FloatRect& boxRect) const
+void LayoutTextCombine::transformLayoutRect(FloatRect& boxRect) const
 {
     ASSERT(!m_needsFontUpdate);
     ASSERT(m_isCombined);
     boxRect.move(offsetXNoScale(boxRect), offsetY());
 }
 
-void RenderCombineText::updateIsCombined()
+void LayoutTextCombine::updateIsCombined()
 {
     // CSS3 spec says text-combine works only in vertical writing mode.
     m_isCombined = !style()->isHorizontalWritingMode()
         // Nothing to combine.
         && !hasEmptyText();
 
     if (m_isCombined)
         m_needsFontUpdate = true;
 }
 
-void RenderCombineText::updateFont()
+void LayoutTextCombine::updateFont()
 {
     if (!m_needsFontUpdate)
         return;
 
     m_needsFontUpdate = false;
 
     if (!m_isCombined)
         return;
 
     TextRun run = constructTextRun(this, originalFont(), this, styleRef(), style()->direction());
@@ skipping 36 matching lines @@
         } else {
             m_scaleX = 1.0f;
         }
     }
 
     if (shouldUpdateFont)
         style()->font().update(fontSelector);
 }
 
 } // namespace blink