Bug 151979 – Make paintTextWithShadows a member function (TextPainter).

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[alan]

SSIA.

[alan]

Created attachment 266840 [details]
Patch

Simplified version:

void TextPainter::paintTextWithShadows(const ShadowData* shadow, const FontCascade& font, const TextRun& textRun, const AtomicString& emphasisMark,
    int emphasisMarkOffset, int startOffset, int endOffset, const FloatPoint& textOrigin, bool stroked)
{
    if (!shadow) {
        drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset);
        return;
    }

    Color fillColor = m_context.fillColor();
    bool opaque = !fillColor.hasAlpha();
    bool lastShadowIterationShouldDrawText = !stroked && opaque;
    if (!opaque)
        m_context.setFillColor(Color::black);
    while (shadow) {
        ShadowApplier shadowApplier(m_context, shadow, m_boxRect, lastShadowIterationShouldDrawText, opaque, m_textBoxIsHorizontal ? Horizontal : Vertical);
        if (!shadowApplier.nothingToDraw())
            drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin + shadowApplier.extraOffset(), startOffset, endOffset);
        shadow = shadow->next();
    }

    if (!lastShadowIterationShouldDrawText) {
        if (!opaque)
            m_context.setFillColor(fillColor);
        drawTextOrEmphasisMarks(font, textRun, emphasisMark, emphasisMarkOffset, textOrigin, startOffset, endOffset);
    }
}

[WebKit Commit Bot]

Attachment 266840 [details] did not pass style-queue:


ERROR: Source/WebCore/rendering/TextPainter.cpp:110:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
ERROR: Source/WebCore/rendering/TextPainter.cpp:197:  Extra space after ( in function call  [whitespace/parens] [4]
Total errors found: 2 in 3 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[alan]

Created attachment 266841 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 266841 [details]
Patch

Clearing flags on attachment: 266841

Committed r193688: <http://trac.webkit.org/changeset/193688>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.