Move paint code from RenderListMarker/RenderListItem to ListMarkerPainter/ListItemPainter.

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
  * 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/RenderListMarker.h"
 
 #include "core/fetch/ImageResource.h"
-#include "core/rendering/GraphicsContextAnnotator.h"
+#include "core/paint/ListMarkerPainter.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderListItem.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 blink {
 
 const int cMarkerPadding = 7;
 
 enum SequenceType { NumericSequence, AlphabeticSequence };
 
 static String toRoman(int number, bool upper)
 {
     // FIXME: CSS3 describes how to make this work for much larger numbers,
@@ skipping 445 matching lines @@
     case UpperGreek:
     case UpperLatin:
     case UpperNorwegian:
         return (value < 1) ? DecimalListStyle : type;
     }
 
     ASSERT_NOT_REACHED();
     return type;
 }
 
-static UChar listMarkerSuffix(EListStyleType type, int value)
+UChar RenderListMarker::listMarkerSuffix(EListStyleType type, int value)
 {
     // If the list-style-type cannot represent |value| because it's outside its
     // ordinal range then we fall back to some list style that can represent |value|.
     EListStyleType effectiveType = effectiveListMarkerType(type, value);
 
     // Note, the following switch statement has been explicitly
     // grouped by list-style-type suffix.
     switch (effectiveType) {
     case Asterisks:
     case Circle:
@@ skipping 610 matching lines @@
         return LayoutRect(LayoutPoint(), size());
     RootInlineBox& root = inlineBoxWrapper()->root();
     LayoutUnit newLogicalTop = root.block().style()->isFlippedBlocksWritingMode() ? inlineBoxWrapper()->logicalBottom() - root.selectionBottom() : root.selectionTop() - inlineBoxWrapper()->logicalTop();
     if (root.block().style()->isHorizontalWritingMode())
         return LayoutRect(0, newLogicalTop, width(), root.selectionHeight());
     return LayoutRect(newLogicalTop, 0, root.selectionHeight(), height());
 }
 
 void RenderListMarker::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
-
-    if (paintInfo.phase != PaintPhaseForeground)
-        return;
-
-    if (style()->visibility() != VISIBLE)
-        return;
-
-    LayoutPoint boxOrigin(paintOffset + location());
-    LayoutRect overflowRect(visualOverflowRect());
-    overflowRect.moveBy(boxOrigin);
-
-    if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect)))
-        return;
-
-    LayoutRect box(boxOrigin, size());
-
-    IntRect marker = getRelativeMarkerRect();
-    marker.moveBy(roundedIntPoint(boxOrigin));
-
-    GraphicsContext* context = paintInfo.context;
-
-    if (isImage()) {
-        context->drawImage(m_image->image(this, marker.size()).get(), marker);
-        if (selectionState() != SelectionNone) {
-            LayoutRect selRect = localSelectionRect();
-            selRect.moveBy(boxOrigin);
-            context->fillRect(pixelSnappedIntRect(selRect), selectionBackgroundColor());
-        }
-        return;
-    }
-
-    if (selectionState() != SelectionNone) {
-        LayoutRect selRect = localSelectionRect();
-        selRect.moveBy(boxOrigin);
-        context->fillRect(pixelSnappedIntRect(selRect), selectionBackgroundColor());
-    }
-
-    const Color color(resolveColor(CSSPropertyColor));
-    context->setStrokeColor(color);
-    context->setStrokeStyle(SolidStroke);
-    context->setStrokeThickness(1.0f);
-    context->setFillColor(color);
-
-    EListStyleType type = style()->listStyleType();
-    switch (type) {
-        case Disc:
-            context->fillEllipse(marker);
-            return;
-        case Circle:
-            context->strokeEllipse(marker);
-            return;
-        case Square:
-            context->fillRect(marker);
-            return;
-        case NoneListStyle:
-            return;
-        case Afar:
-        case Amharic:
-        case AmharicAbegede:
-        case ArabicIndic:
-        case Armenian:
-        case BinaryListStyle:
-        case Bengali:
-        case Cambodian:
-        case CJKIdeographic:
-        case CjkEarthlyBranch:
-        case CjkHeavenlyStem:
-        case DecimalLeadingZero:
-        case DecimalListStyle:
-        case Devanagari:
-        case Ethiopic:
-        case EthiopicAbegede:
-        case EthiopicAbegedeAmEt:
-        case EthiopicAbegedeGez:
-        case EthiopicAbegedeTiEr:
-        case EthiopicAbegedeTiEt:
-        case EthiopicHalehameAaEr:
-        case EthiopicHalehameAaEt:
-        case EthiopicHalehameAmEt:
-        case EthiopicHalehameGez:
-        case EthiopicHalehameOmEt:
-        case EthiopicHalehameSidEt:
-        case EthiopicHalehameSoEt:
-        case EthiopicHalehameTiEr:
-        case EthiopicHalehameTiEt:
-        case EthiopicHalehameTig:
-        case Georgian:
-        case Gujarati:
-        case Gurmukhi:
-        case Hangul:
-        case HangulConsonant:
-        case Hebrew:
-        case Hiragana:
-        case HiraganaIroha:
-        case Kannada:
-        case Katakana:
-        case KatakanaIroha:
-        case Khmer:
-        case Lao:
-        case LowerAlpha:
-        case LowerArmenian:
-        case LowerGreek:
-        case LowerHexadecimal:
-        case LowerLatin:
-        case LowerNorwegian:
-        case LowerRoman:
-        case Malayalam:
-        case Mongolian:
-        case Myanmar:
-        case Octal:
-        case Oriya:
-        case Oromo:
-        case Persian:
-        case Sidama:
-        case Somali:
-        case Telugu:
-        case Thai:
-        case Tibetan:
-        case Tigre:
-        case TigrinyaEr:
-        case TigrinyaErAbegede:
-        case TigrinyaEt:
-        case TigrinyaEtAbegede:
-        case UpperAlpha:
-        case UpperArmenian:
-        case UpperGreek:
-        case UpperHexadecimal:
-        case UpperLatin:
-        case UpperNorwegian:
-        case UpperRoman:
-        case Urdu:
-        case Asterisks:
-        case Footnotes:
-            break;
-    }
-    if (m_text.isEmpty())
-        return;
-
-    const Font& font = style()->font();
-    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());
-    }
-
-    TextRunPaintInfo textRunPaintInfo(textRun);
-    textRunPaintInfo.bounds = marker;
-    IntPoint textOrigin = IntPoint(marker.x(), marker.y() + style()->fontMetrics().ascent());
-
-    if (type == Asterisks || type == Footnotes) {
-        context->drawText(font, textRunPaintInfo, textOrigin);
-    }
-    else {
-        // Text is not arbitrary. We can judge whether it's RTL from the first character,
-        // and we only need to handle the direction RightToLeft for now.
-        bool textNeedsReversing = direction(m_text[0]) == RightToLeft;
-        StringBuilder reversedText;
-        if (textNeedsReversing) {
-            int length = m_text.length();
-            reversedText.reserveCapacity(length);
-            for (int i = length - 1; i >= 0; --i)
-                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 = 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));
-        }
-    }
+    ListMarkerPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void RenderListMarker::layout()
 {
     ASSERT(needsLayout());
 
     if (isImage()) {
         updateMarginsAndContent();
         setWidth(m_image->imageSize(this, style()->effectiveZoom()).width());
         setHeight(m_image->imageSize(this, style()->effectiveZoom()).height());
@@ skipping 485 matching lines @@
     if (selectionState() == SelectionNone || !inlineBoxWrapper())
         return LayoutRect();
 
     RootInlineBox& root = inlineBoxWrapper()->root();
     LayoutRect rect(0, root.selectionTop() - y(), width(), root.selectionHeight());
 
     return localToContainerQuad(FloatRect(rect), paintInvalidationContainer).enclosingBoundingBox();
 }
 
 } // namespace blink