Move RenderBlockFlow::constructTextRun out.

Source/core/rendering/RenderCombineText.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/rendering/RenderBlockFlow.h"
+#include "core/rendering/TextRunConstructor.h"
 
 namespace WebCore {
 
 const float textCombineMargin = 1.1f; // Allow em + 10% margin
 
 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)
      : RenderText(node, string)
      , m_combinedTextWidth(0)
      , m_isCombined(false)
      , m_needsFontUpdate(false)
@@ skipping 57 matching lines @@
     if (!m_needsFontUpdate)
         return;
 
     m_isCombined = false;
     m_needsFontUpdate = false;
 
     // CSS3 spec says text-combine works only in vertical writing mode.
     if (style()->isHorizontalWritingMode())
         return;
 
-    TextRun run = RenderBlockFlow::constructTextRun(this, originalFont(), this, style(), style()->direction());
+    TextRun run = constructTextRun(this, originalFont(), this, style(), style()->direction());
     FontDescription description = originalFont().fontDescription();
     float emWidth = description.computedSize() * textCombineMargin;
     bool shouldUpdateFont = false;
 
     description.setOrientation(Horizontal); // We are going to draw combined text horizontally.
     m_combinedTextWidth = originalFont().width(run);
     m_isCombined = m_combinedTextWidth <= emWidth;
 
     FontSelector* fontSelector = style()->font().fontSelector();
 
@@ skipping 25 matching lines @@
         style()->font().update(fontSelector);
 
     if (m_isCombined) {
         DEFINE_STATIC_LOCAL(String, objectReplacementCharacterString, (&objectReplacementCharacter, 1));
         m_renderingText = text();
         RenderText::setTextInternal(objectReplacementCharacterString.impl());
     }
 }
 
 } // namespace WebCore