Changeset 70263 in webkit

Timestamp:

Oct 21, 2010 2:16:55 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=48085

Reviewed by Darin Adler.

Make basic vertical text painting work. This includes the text itself, underlines, overlines, line-throughs and shadows.

Added fast/blockflow/english-lr-text.html

WebCore:

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::paint):

• rendering/InlineFlowBox.h:
• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::applyShadowToGraphicsContext):
(WebCore::paintTextWithShadows):
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::paintDecoration):
(WebCore::InlineTextBox::paintTextMatchMarker):

• rendering/InlineTextBox.h:
• rendering/svg/SVGInlineTextBox.cpp:

(WebCore::SVGInlineTextBox::paintTextWithShadows):

LayoutTests:

• fast/blockflow/english-lr-text.html: Added.
• platform/mac/fast/blockflow/english-lr-text-expected.checksum: Added.
• platform/mac/fast/blockflow/english-lr-text-expected.png: Added.
• platform/mac/fast/blockflow/english-lr-text-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/blockflow/english-lr-text.html (added)
• LayoutTests/platform/mac/fast/blockflow/english-lr-text-expected.checksum (added)
• LayoutTests/platform/mac/fast/blockflow/english-lr-text-expected.png (added)
• LayoutTests/platform/mac/fast/blockflow/english-lr-text-expected.txt (added)
• LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.png (modified) (previous)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/rendering/InlineFlowBox.cpp (modified) (4 diffs)
• WebCore/rendering/InlineFlowBox.h (modified) (1 diff)
• WebCore/rendering/InlineTextBox.cpp (modified) (18 diffs)
• WebCore/rendering/InlineTextBox.h (modified) (1 diff)
• WebCore/rendering/svg/SVGInlineTextBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-21  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48085
+
+        Make basic vertical text painting work.  This includes the text itself, underlines, overlines, line-throughs and shadows.
+
+        Added fast/blockflow/english-lr-text.html
+
+        * fast/blockflow/english-lr-text.html: Added.
+        * platform/mac/fast/blockflow/english-lr-text-expected.checksum: Added.
+        * platform/mac/fast/blockflow/english-lr-text-expected.png: Added.
+        * platform/mac/fast/blockflow/english-lr-text-expected.txt: Added.
+
 2010-10-21  James Robinson  <jamesr@chromium.org>
 

trunk/LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.checksum

@@ -1 @@
-83a57acedeb979e93959cf59fe59cdfc
+386f323eb617f371186afe888df1ce4e

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-21  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48085
+
+        Make basic vertical text painting work.  This includes the text itself, underlines, overlines, line-throughs and shadows.
+
+        Added fast/blockflow/english-lr-text.html
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paint):
+        * rendering/InlineFlowBox.h:
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::applyShadowToGraphicsContext):
+        (WebCore::paintTextWithShadows):
+        (WebCore::InlineTextBox::paint):
+        (WebCore::InlineTextBox::paintDecoration):
+        (WebCore::InlineTextBox::paintTextMatchMarker):
+        * rendering/InlineTextBox.h:
+        * rendering/svg/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::paintTextWithShadows):
+
 2010-10-21  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -21201 +21201 @@
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
                         compatibilityVersion = "Xcode 2.4";
+                        developmentRegion = English;
                         hasScannedForEncodings = 1;
                         knownRegions = (

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -702 +702 @@
             return;
         } else {
-            // 1. Paint our background, border and box-shadow.
+            // Paint our background, border and box-shadow.
             paintBoxDecorations(paintInfo, tx, ty);
-
-            // 2. Paint our underline and overline.
-            paintTextDecorations(paintInfo, tx, ty, false);
         }
     }
@@ -718 +715 @@
     childInfo.updatePaintingRootForChildren(renderer());
     
-    // 3. Paint our children.
+    // Paint our children.
     if (paintPhase != PaintPhaseSelfOutline) {
         for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
@@ -725 +722 @@
         }
     }
-
-    // 4. Paint our strike-through
-    if (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection)
-        paintTextDecorations(paintInfo, tx, ty, true);
 }
 
@@ -931 +924 @@
 }
 
-static bool shouldDrawTextDecoration(RenderObject* obj)
-{
-    for (RenderObject* curr = obj->firstChild(); curr; curr = curr->nextSibling()) {
-        if (curr->isRenderInline())
-            return true;
-        if (curr->isText() && !curr->isBR()) {
-            if (!curr->style()->collapseWhiteSpace())
-                return true;
-            Node* currElement = curr->node();
-            if (!currElement)
-                return true;
-            if (!currElement->isTextNode())
-                return true;
-            if (!static_cast<Text*>(currElement)->containsOnlyWhitespace())
-                return true;
-        }
-    }
-    return false;
-}
-
-void InlineFlowBox::paintTextDecorations(PaintInfo& paintInfo, int tx, int ty, bool paintedChildren)
-{
-    // Paint text decorations like underlines/overlines. We only do this if we aren't in quirks mode (i.e., in
-    // almost-strict mode or strict mode).
-    if (renderer()->document()->inQuirksMode() || !paintInfo.shouldPaintWithinRoot(renderer()) ||
-        renderer()->style()->visibility() != VISIBLE)
-        return;
-    
-    // We don't want underlines or other decorations when we're trying to draw nothing but the selection as white text.
-    if (paintInfo.phase == PaintPhaseSelection && paintInfo.forceBlackText)
-        return;
-
-    GraphicsContext* context = paintInfo.context;
-    tx += m_x;
-    ty += m_y;
-    RenderStyle* styleToUse = renderer()->style(m_firstLine);
-    int deco = parent() ? styleToUse->textDecoration() : styleToUse->textDecorationsInEffect();
-    if (deco != TDNONE && 
-        ((!paintedChildren && ((deco & UNDERLINE) || (deco & OVERLINE))) || (paintedChildren && (deco & LINE_THROUGH))) &&
-        shouldDrawTextDecoration(renderer())) {
-        int x = m_x + borderLogicalLeft() + paddingLogicalLeft();
-        int w = m_logicalWidth - (borderLogicalLeft() + paddingLogicalLeft() + borderLogicalRight() + paddingLogicalRight());
-        RootInlineBox* rootLine = root();
-        if (rootLine->ellipsisBox()) {
-            int ellipsisX = m_x + rootLine->ellipsisBox()->x();
-            int ellipsisWidth = rootLine->ellipsisBox()->logicalWidth();
-            bool ltr = renderer()->style()->isLeftToRightDirection();
-            if (rootLine == this) {
-                // Trim w and x so that the underline isn't drawn underneath the ellipsis.
-                // ltr: is our right edge farther right than the right edge of the ellipsis.
-                // rtl: is the left edge of our box farther left than the left edge of the ellipsis.
-                bool ltrTruncation = ltr && (x + w >= ellipsisX + ellipsisWidth);
-                bool rtlTruncation = !ltr && (x <= ellipsisX + ellipsisWidth);
-                if (ltrTruncation)
-                    w -= (x + w) - (ellipsisX + ellipsisWidth);
-                else if (rtlTruncation) {
-                    int dx = m_x - ((ellipsisX - m_x) + ellipsisWidth);
-                    tx -= dx;
-                    w += dx;
-                }
-            } else {
-                bool ltrPastEllipsis = ltr && x >= ellipsisX;
-                bool rtlPastEllipsis = !ltr && (x + w) <= (ellipsisX + ellipsisWidth);
-                if (ltrPastEllipsis || rtlPastEllipsis)
-                    return;
-
-                bool ltrTruncation = ltr && x + w >= ellipsisX;
-                bool rtlTruncation = !ltr && x <= ellipsisX;
-                if (ltrTruncation)
-                    w -= (x + w - ellipsisX);
-                else if (rtlTruncation) {
-                    int dx = m_x - ((ellipsisX - m_x) + ellipsisWidth);
-                    tx -= dx;
-                    w += dx;
-                }
-            }
-        }
-
-        // We must have child boxes and have decorations defined.
-        tx += borderLogicalLeft() + paddingLogicalLeft();
-
-        Color underline, overline, linethrough;
-        underline = overline = linethrough = styleToUse->visitedDependentColor(CSSPropertyColor);
-        if (!parent())
-            renderer()->getTextDecorationColors(deco, underline, overline, linethrough);
-
-        bool isPrinting = renderer()->document()->printing();
-        context->setStrokeThickness(1.0f); // FIXME: We should improve this rule and not always just assume 1.
-
-        bool paintUnderline = deco & UNDERLINE && !paintedChildren;
-        bool paintOverline = deco & OVERLINE && !paintedChildren;
-        bool paintLineThrough = deco & LINE_THROUGH && paintedChildren;
-
-        bool linesAreOpaque = !isPrinting && (!paintUnderline || underline.alpha() == 255) && (!paintOverline || overline.alpha() == 255) && (!paintLineThrough || linethrough.alpha() == 255);
-
-        int baselinePos = renderer()->style(m_firstLine)->font().ascent();
-        if (!isRootInlineBox())
-            baselinePos += boxModelObject()->borderTop() + boxModelObject()->paddingTop();
-
-        bool setClip = false;
-        int extraOffset = 0;
-        const ShadowData* shadow = styleToUse->textShadow();
-        if (!linesAreOpaque && shadow && shadow->next()) {
-            IntRect clipRect(tx, ty, w, baselinePos + 2);
-            for (const ShadowData* s = shadow; s; s = s->next()) {
-                IntRect shadowRect(tx, ty, w, baselinePos + 2);
-                shadowRect.inflate(s->blur());
-                shadowRect.move(s->x(), s->y());
-                clipRect.unite(shadowRect);
-                extraOffset = max(extraOffset, max(0, s->y()) + s->blur());
-            }
-            context->save();
-            context->clip(clipRect);
-            extraOffset += baselinePos + 2;
-            ty += extraOffset;
-            setClip = true;
-        }
-
-        ColorSpace colorSpace = renderer()->style()->colorSpace();
-        bool setShadow = false;
-        do {
-            if (shadow) {
-                if (!shadow->next()) {
-                    // The last set of lines paints normally inside the clip.
-                    ty -= extraOffset;
-                    extraOffset = 0;
-                }
-                context->setShadow(IntSize(shadow->x(), shadow->y() - extraOffset), shadow->blur(), shadow->color(), colorSpace);
-                setShadow = true;
-                shadow = shadow->next();
-            }
-
-            if (paintUnderline) {
-                context->setStrokeColor(underline, colorSpace);
-                context->setStrokeStyle(SolidStroke);
-                // Leave one pixel of white between the baseline and the underline.
-                context->drawLineForText(IntPoint(tx, ty + baselinePos + 1), w, isPrinting);
-            }
-            if (paintOverline) {
-                context->setStrokeColor(overline, colorSpace);
-                context->setStrokeStyle(SolidStroke);
-                context->drawLineForText(IntPoint(tx, ty), w, isPrinting);
-            }
-            if (paintLineThrough) {
-                context->setStrokeColor(linethrough, colorSpace);
-                context->setStrokeStyle(SolidStroke);
-                context->drawLineForText(IntPoint(tx, ty + 2 * baselinePos / 3), w, isPrinting);
-            }
-        } while (shadow);
-
-        if (setClip)
-            context->restore();
-        else if (setShadow)
-            context->clearShadow();
-    }
-}
-
 InlineBox* InlineFlowBox::firstLeafChild() const
 {

trunk/WebCore/rendering/InlineFlowBox.h

@@ -97 +97 @@
     void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, int tx, int ty, int w, int h, CompositeOperator = CompositeSourceOver);
     void paintBoxShadow(GraphicsContext*, RenderStyle*, ShadowStyle, int tx, int ty, int w, int h);
-    virtual void paintTextDecorations(PaintInfo&, int tx, int ty, bool paintedChildren = false);
     virtual void paint(PaintInfo&, int tx, int ty);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty);

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -312 +312 @@
 }
 
-FloatSize InlineTextBox::applyShadowToGraphicsContext(GraphicsContext* context, const ShadowData* shadow, const FloatRect& textRect, bool stroked, bool opaque)
+FloatSize InlineTextBox::applyShadowToGraphicsContext(GraphicsContext* context, const ShadowData* shadow, const FloatRect& textRect, bool stroked, bool opaque, bool vertical)
 {
     if (!shadow)
@@ -318 +318 @@
 
     FloatSize extraOffset;
-    FloatSize shadowOffset(shadow->x(), shadow->y());
+    int shadowX = vertical ? shadow->y() : shadow->x();
+    int shadowY = vertical ? -shadow->x() : shadow->y();
+    FloatSize shadowOffset(shadowX, shadowY);
     int shadowBlur = shadow->blur();
     const Color& shadowColor = shadow->color();
@@ -337 +339 @@
 }
 
-static void paintTextWithShadows(GraphicsContext* context, const Font& font, const TextRun& textRun, int startOffset, int endOffset, int truncationPoint, const IntPoint& textOrigin, int x, int y, int w, int h, const ShadowData* shadow, bool stroked)
+static void paintTextWithShadows(GraphicsContext* context, const Font& font, const TextRun& textRun, int startOffset, int endOffset, int truncationPoint, const IntPoint& textOrigin,
+                                 int x, int y, int w, int h, const ShadowData* shadow, bool stroked, bool vertical)
 {
     Color fillColor = context->fillColor();
@@ -348 +351 @@
         IntSize extraOffset;
         if (shadow)
-            extraOffset = roundedIntSize(InlineTextBox::applyShadowToGraphicsContext(context, shadow, FloatRect(x, y, w, h), stroked, opaque));
+            extraOffset = roundedIntSize(InlineTextBox::applyShadowToGraphicsContext(context, shadow, FloatRect(x, y, w, h), stroked, opaque, vertical));
         else if (!opaque)
             context->setFillColor(fillColor, fillColorSpace);
@@ -376 +379 @@
 {
     if (isLineBreak() || !paintInfo.shouldPaintWithinRoot(renderer()) || renderer()->style()->visibility() != VISIBLE ||
-        m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline)
+        m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len)
         return;
 
@@ -411 +414 @@
             int widthOfHiddenText = m_logicalWidth - widthOfVisibleText;
             // FIXME: The hit testing logic also needs to take this translation int account.
-            tx += isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText;
+            if (!m_isVertical)
+                tx += isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText;
+            else
+                ty += isLeftToRightDirection() ? widthOfHiddenText : -widthOfHiddenText;
         }
     }
@@ -417 +423 @@
     GraphicsContext* context = paintInfo.context;
 
+    RenderStyle* styleToUse = renderer()->style(m_firstLine);
+    int baseline = styleToUse->font().ascent();
+    ty -= styleToUse->isFlippedLinesWritingMode() ? baseline : 0;
+    IntPoint textOrigin(m_x + tx, m_y + ty + baseline);
+    
+    if (m_isVertical) {
+        context->save();
+        context->translate(textOrigin.x(), textOrigin.y());
+        context->rotate(deg2rad(90.));
+        context->translate(-textOrigin.x(), -textOrigin.y());
+    }
+    
     // Determine whether or not we have composition underlines to draw.
     bool containsComposition = renderer()->node() && renderer()->frame()->editor()->compositionNode() == renderer()->node();
@@ -422 +440 @@
 
     // Set our font.
-    RenderStyle* styleToUse = renderer()->style(m_firstLine);
     int d = styleToUse->textDecorationsInEffect();
     const Font& font = styleToUse->font();
@@ -447 +464 @@
 
     // 2. Now paint the foreground, including text and decorations like underline/overline (in quirks mode only).
-    if (m_len <= 0)
-        return;
-
     Color textFillColor;
     Color textStrokeColor;
@@ -518 +532 @@
         adjustCharactersAndLengthForHyphen(charactersWithHyphen, styleToUse, characters, length);
 
-    int baseline = renderer()->style(m_firstLine)->font().ascent();
-    IntPoint textOrigin(m_x + tx, m_y + ty + baseline);
     TextRun textRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || styleToUse->visuallyOrdered());
 
@@ -542 +554 @@
         if (!paintSelectedTextSeparately || ePos <= sPos) {
             // FIXME: Truncate right-to-left text correctly.
-            paintTextWithShadows(context, font, textRun, 0, length, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), textShadow, textStrokeWidth > 0);
+            paintTextWithShadows(context, font, textRun, 0, length, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), textShadow, textStrokeWidth > 0, m_isVertical);
         } else
-            paintTextWithShadows(context, font, textRun, ePos, sPos, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), textShadow, textStrokeWidth > 0);
+            paintTextWithShadows(context, font, textRun, ePos, sPos, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), textShadow, textStrokeWidth > 0, m_isVertical);
 
         if (textStrokeWidth > 0)
@@ -556 +568 @@
 
         updateGraphicsContext(context, selectionFillColor, selectionStrokeColor, selectionStrokeWidth, styleToUse->colorSpace());
-        paintTextWithShadows(context, font, textRun, sPos, ePos, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), selectionShadow, selectionStrokeWidth > 0);
+        paintTextWithShadows(context, font, textRun, sPos, ePos, length, textOrigin, m_x + tx, m_y + ty, logicalWidth(), logicalHeight(), selectionShadow, selectionStrokeWidth > 0, m_isVertical);
 
         if (selectionStrokeWidth > 0)
@@ -563 +575 @@
 
     // Paint decorations
-    if (d != TDNONE && paintInfo.phase != PaintPhaseSelection && renderer()->document()->inQuirksMode()) {
-        context->setStrokeColor(styleToUse->visitedDependentColor(CSSPropertyColor), styleToUse->colorSpace());
+    if (d != TDNONE && paintInfo.phase != PaintPhaseSelection) {
+        updateGraphicsContext(context, textFillColor, textStrokeColor, textStrokeWidth, styleToUse->colorSpace());
         paintDecoration(context, tx, ty, d, textShadow);
     }
@@ -596 +608 @@
         }
     }
+    
+    if (m_isVertical)
+        context->restore();
 }
 
@@ -724 +739 @@
     bool linesAreOpaque = !isPrinting && (!(deco & UNDERLINE) || underline.alpha() == 255) && (!(deco & OVERLINE) || overline.alpha() == 255) && (!(deco & LINE_THROUGH) || linethrough.alpha() == 255);
 
-    int baseline = renderer()->style(m_firstLine)->font().ascent();
+    RenderStyle* styleToUse = renderer()->style(m_firstLine);
+    int baseline = styleToUse->font().ascent();
 
     bool setClip = false;
@@ -734 +750 @@
             IntRect shadowRect(tx, ty, width, baseline + 2);
             shadowRect.inflate(s->blur());
-            shadowRect.move(s->x(), s->y());
+            int shadowX = m_isVertical ? s->y() : s->x();
+            int shadowY = m_isVertical ? -s->x() : s->y();
+            shadowRect.move(shadowX, shadowY);
             clipRect.unite(shadowRect);
-            extraOffset = max(extraOffset, max(0, s->y()) + s->blur());
+            extraOffset = max(extraOffset, max(0, shadowY) + s->blur());
         }
         context->save();
@@ -755 +773 @@
                 extraOffset = 0;
             }
-            context->setShadow(IntSize(shadow->x(), shadow->y() - extraOffset), shadow->blur(), shadow->color(), colorSpace);
+            int shadowX = m_isVertical ? shadow->y() : shadow->x();
+            int shadowY = m_isVertical ? -shadow->x() : shadow->y();
+            context->setShadow(IntSize(shadowX, shadowY - extraOffset), shadow->blur(), shadow->color(), colorSpace);
             setShadow = true;
             shadow = shadow->next();
@@ -880 +900 @@
     markerRect = renderer()->localToAbsoluteQuad(FloatRect(markerRect)).enclosingBoundingBox();
     renderer()->document()->markers()->setRenderedRectForMarker(renderer()->node(), marker, markerRect);
-     
+    
     // Optionally highlight the text
     if (renderer()->frame()->editor()->markedTextMatchesAreHighlighted()) {

trunk/WebCore/rendering/InlineTextBox.h

@@ -128 +128 @@
 
     // Needs to be public, so the static paintTextWithShadows() function can use it.
-    static FloatSize applyShadowToGraphicsContext(GraphicsContext*, const ShadowData*, const FloatRect& textRect, bool stroked, bool opaque);
+    static FloatSize applyShadowToGraphicsContext(GraphicsContext*, const ShadowData*, const FloatRect& textRect, bool stroked, bool opaque, bool vertical);
 
 private:

trunk/WebCore/rendering/svg/SVGInlineTextBox.cpp

@@ -524 +524 @@
         FloatSize extraOffset;
         if (shadow)
-            extraOffset = applyShadowToGraphicsContext(context, shadow, shadowRect, false /* stroked */, true /* opaque */);
+            extraOffset = applyShadowToGraphicsContext(context, shadow, shadowRect, false /* stroked */, true /* opaque */, false /* vertical */);
 
         font.drawText(context, textRun, textOrigin + extraOffset, startPosition, endPosition);