Move RenderBlockFlow::constructTextRun out.

Source/core/rendering/RenderListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * 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
@@ skipping 11 matching lines @@
  *
  */
 
 #include "config.h"
 #include "core/rendering/RenderListMarker.h"
 
 #include "core/fetch/ImageResource.h"
 #include "core/rendering/GraphicsContextAnnotator.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderListItem.h"
-#include "core/rendering/RenderView.h"
+#include "core/rendering/TextRunConstructor.h"
 #include "platform/fonts/Font.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/unicode/CharacterNames.h"
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace WebCore {
 
@@ skipping 1212 matching lines @@
         case UpperRoman:
         case Urdu:
         case Asterisks:
         case Footnotes:
             break;
     }
     if (m_text.isEmpty())
         return;
 
     const Font& font = style()->font();
-    TextRun textRun = RenderBlockFlow::constructTextRun(this, font, m_text, style());
+    TextRun textRun = constructTextRun(this, font, m_text, style());
 
     GraphicsContextStateSaver stateSaver(*context, false);
     if (!style()->isHorizontalWritingMode()) {
         marker.moveBy(roundedIntPoint(-boxOrigin));
         marker = marker.transposedRect();
         marker.moveBy(IntPoint(roundToInt(box.x()), roundToInt(box.y() - logicalHeight())));
         stateSaver.save();
         context->translate(marker.x(), marker.maxY());
         context->rotate(static_cast<float>(deg2rad(90.)));
         context->translate(-marker.x(), -marker.maxY());
@@ skipping 18 matching lines @@
                 reversedText.append(m_text[i]);
             ASSERT(reversedText.length() == reversedText.capacity());
             textRun.setText(reversedText.toString());
         }
 
         const UChar suffix = listMarkerSuffix(type, m_listItem->value());
         UChar suffixStr[2] = {
             style()->isLeftToRightDirection() ? suffix : ' ',
             style()->isLeftToRightDirection() ? ' ' : suffix
         };
-        TextRun suffixRun = RenderBlockFlow::constructTextRun(this, font, suffixStr, 2, style(), style()->direction());
+        TextRun suffixRun = constructTextRun(this, font, suffixStr, 2, style(), style()->direction());
         TextRunPaintInfo suffixRunInfo(suffixRun);
         suffixRunInfo.bounds = marker;
 
         if (style()->isLeftToRightDirection()) {
             context->drawText(font, textRunPaintInfo, textOrigin);
             context->drawText(font, suffixRunInfo, textOrigin + IntSize(font.width(textRun), 0));
         } else {
             context->drawText(font, suffixRunInfo, textOrigin);
             context->drawText(font, textRunPaintInfo, textOrigin + IntSize(font.width(suffixRun), 0));
         }
@@ skipping 256 matching lines @@
         case UpperHexadecimal:
         case UpperLatin:
         case UpperNorwegian:
         case UpperRoman:
         case Urdu:
             if (m_text.isEmpty())
                 logicalWidth = 0;
             else {
                 LayoutUnit itemWidth = font.width(m_text);
                 UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem->value()), ' ' };
-                LayoutUnit suffixSpaceWidth = font.width(RenderBlockFlow::constructTextRun(this, font, suffixSpace, 2, style(), style()->direction()));
+                LayoutUnit suffixSpaceWidth = font.width(constructTextRun(this, font, suffixSpace, 2, style(), style()->direction()));
                 logicalWidth = itemWidth + suffixSpaceWidth;
             }
             break;
     }
 
     m_minPreferredLogicalWidth = logicalWidth;
     m_maxPreferredLogicalWidth = logicalWidth;
 
     clearPreferredLogicalWidthsDirty();
 
@@ skipping 205 matching lines @@
         case UpperHexadecimal:
         case UpperLatin:
         case UpperNorwegian:
         case UpperRoman:
         case Urdu:
             if (m_text.isEmpty())
                 return IntRect();
             const Font& font = style()->font();
             int itemWidth = font.width(m_text);
             UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem->value()), ' ' };
-            int suffixSpaceWidth = font.width(RenderBlockFlow::constructTextRun(this, font, suffixSpace, 2, style(), style()->direction()));
+            int suffixSpaceWidth = font.width(constructTextRun(this, font, suffixSpace, 2, style(), style()->direction()));
             relativeRect = IntRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
     }
 
     if (!style()->isHorizontalWritingMode()) {
         relativeRect = relativeRect.transposedRect();
         relativeRect.setX(width() - relativeRect.x() - relativeRect.width());
     }
 
     return relativeRect;
 }
@@ skipping 19 matching lines @@
 
     if (clipToVisibleContent)
         mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect);
     else
         rect = localToContainerQuad(FloatRect(rect), paintInvalidationContainer).enclosingBoundingBox();
 
     return rect;
 }
 
 } // namespace WebCore