Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / EllipsisBox.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/EllipsisBox.cpp b/src/third_party/WebKit/Source/core/rendering/EllipsisBox.cpp
index 9f3e026..bbdba5f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/EllipsisBox.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/EllipsisBox.cpp
@@ -20,78 +20,22 @@
 #include "config.h"
 #include "core/rendering/EllipsisBox.h"
 
+#include "core/paint/EllipsisBoxPainter.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/InlineTextBox.h"
 #include "core/rendering/PaintInfo.h"
-#include "core/rendering/RenderBlockFlow.h"
+#include "core/rendering/RenderBlock.h"
 #include "core/rendering/RootInlineBox.h"
+#include "core/rendering/TextRunConstructor.h"
 #include "core/rendering/style/ShadowList.h"
 #include "platform/fonts/Font.h"
-#include "platform/graphics/DrawLooperBuilder.h"
-#include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/text/TextRun.h"
 
-namespace WebCore {
+namespace blink {
 
 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
 {
-    GraphicsContext* context = paintInfo.context;
-    RenderStyle* style = renderer().style(isFirstLineStyle());
-
-    const Font& font = style->font();
-    FloatPoint boxOrigin = locationIncludingFlipping();
-    boxOrigin.moveBy(FloatPoint(paintOffset));
-    if (!isHorizontal())
-        boxOrigin.move(0, -virtualLogicalHeight());
-    FloatRect boxRect(boxOrigin, LayoutSize(logicalWidth(), virtualLogicalHeight()));
-    GraphicsContextStateSaver stateSaver(*context);
-    if (!isHorizontal())
-        context->concatCTM(InlineTextBox::rotation(boxRect, InlineTextBox::Clockwise));
-    FloatPoint textOrigin = FloatPoint(boxOrigin.x(), boxOrigin.y() + font.fontMetrics().ascent());
-
-    Color styleTextColor = renderer().resolveColor(style, CSSPropertyWebkitTextFillColor);
-    if (styleTextColor != context->fillColor())
-        context->setFillColor(styleTextColor);
-
-    if (selectionState() != RenderObject::SelectionNone) {
-        paintSelection(context, boxOrigin, style, font);
-
-        // Select the correct color for painting the text.
-        Color foreground = paintInfo.forceBlackText() ? Color::black : renderer().selectionForegroundColor();
-        if (foreground != styleTextColor)
-            context->setFillColor(foreground);
-    }
-
-    // Text shadows are disabled when printing. http://crbug.com/258321
-    const ShadowList* shadowList = context->printing() ? 0 : style->textShadow();
-    bool hasShadow = shadowList;
-    if (hasShadow) {
-        OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();
-        for (size_t i = shadowList->shadows().size(); i--; ) {
-            const ShadowData& shadow = shadowList->shadows()[i];
-            float shadowX = isHorizontal() ? shadow.x() : shadow.y();
-            float shadowY = isHorizontal() ? shadow.y() : -shadow.x();
-            FloatSize offset(shadowX, shadowY);
-            drawLooperBuilder->addShadow(offset, shadow.blur(), shadow.color(),
-                DrawLooperBuilder::ShadowRespectsTransforms, DrawLooperBuilder::ShadowIgnoresAlpha);
-        }
-        drawLooperBuilder->addUnmodifiedContent();
-        context->setDrawLooper(drawLooperBuilder.release());
-    }
-
-    TextRun textRun = RenderBlockFlow::constructTextRun(&renderer(), font, m_str, style, TextRun::AllowTrailingExpansion);
-    TextRunPaintInfo textRunPaintInfo(textRun);
-    textRunPaintInfo.bounds = boxRect;
-    context->drawText(font, textRunPaintInfo, textOrigin);
-
-    // Restore the regular fill color.
-    if (styleTextColor != context->fillColor())
-        context->setFillColor(styleTextColor);
-
-    if (hasShadow)
-        context->clearDrawLooper();
-
-    paintMarkupBox(paintInfo, paintOffset, lineTop, lineBottom, style);
+    EllipsisBoxPainter(*this).paint(paintInfo, paintOffset, lineTop, lineBottom);
 }
 
 InlineBox* EllipsisBox::markupBox() const
@@ -113,47 +57,11 @@ InlineBox* EllipsisBox::markupBox() const
     return anchorBox;
 }
 
-void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
-{
-    InlineBox* markupBox = this->markupBox();
-    if (!markupBox)
-        return;
-
-    LayoutPoint adjustedPaintOffset = paintOffset;
-    adjustedPaintOffset.move(x() + m_logicalWidth - markupBox->x(),
-        y() + style->fontMetrics().ascent() - (markupBox->y() + markupBox->renderer().style(isFirstLineStyle())->fontMetrics().ascent()));
-    markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
-}
-
 IntRect EllipsisBox::selectionRect()
 {
     RenderStyle* style = renderer().style(isFirstLineStyle());
     const Font& font = style->font();
-    return enclosingIntRect(font.selectionRectForText(RenderBlockFlow::constructTextRun(&renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(logicalLeft(), logicalTop() + root().selectionTopAdjustedForPrecedingBlock()), root().selectionHeightAdjustedForPrecedingBlock()));
-}
-
-void EllipsisBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font)
-{
-    Color textColor = renderer().resolveColor(style, CSSPropertyColor);
-    Color c = renderer().selectionBackgroundColor();
-    if (!c.alpha())
-        return;
-
-    // If the text color ends up being the same as the selection background, invert the selection
-    // background.
-    if (textColor == c)
-        c = Color(0xff - c.red(), 0xff - c.green(), 0xff - c.blue());
-
-    GraphicsContextStateSaver stateSaver(*context);
-    LayoutUnit selectionBottom = root().selectionBottom();
-    LayoutUnit top = root().selectionTop();
-    LayoutUnit h = root().selectionHeight();
-    const int deltaY = roundToInt(renderer().style()->isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - top);
-    const FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
-    FloatRect clipRect(localOrigin, FloatSize(m_logicalWidth, h.toFloat()));
-    alignSelectionRectToDevicePixels(clipRect);
-    context->clip(clipRect);
-    context->drawHighlightForText(font, RenderBlockFlow::constructTextRun(&renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), localOrigin, h, c);
+    return enclosingIntRect(font.selectionRectForText(constructTextRun(&renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(logicalLeft(), logicalTop() + root().selectionTopAdjustedForPrecedingBlock()), root().selectionHeightAdjustedForPrecedingBlock()));
 }
 
 bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
@@ -183,4 +91,4 @@ bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu
     return false;
 }
 
-} // namespace WebCore
+} // namespace blink