Bug 42123 – [Cairo] Incorrect Test for Text Fill

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Brent Fulgham]

Mihnea Ovidenea reported that several test cases fail because of an invalid test in FontCairo.cpp:

bfulgham@bfulgham-Win7VM ~/WebKit/WebCore/platform/graphics/cairo
$ svn diff FontCairo.cpp
Index: FontCairo.cpp
===================================================================
--- FontCairo.cpp       (revision 62870)
+++ FontCairo.cpp       (working copy)
@@ -73,7 +73,7 @@
     FloatSize shadowSize;
     float shadowBlur = 0;
     Color shadowColor;
-    bool hasShadow = context->textDrawingMode() == cTextFill &&
+    bool hasShadow = context->textDrawingMode() & cTextFill &&
         context->getShadow(shadowSize, shadowBlur, shadowColor);

     // TODO: Blur support


Tests that show this problem:

1. fast/text/stroking-decorations.html
2. fast/text/stroking.html
3. fast/text/shadow-translucent-fill.html

[Brent Fulgham]

Created attachment 61306 [details]
Correct shadow test for stroke & fill case

[WebKit Review Bot]

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

Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
WebCore/platform/graphics/cairo/FontCairo.cpp:76:  Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side.  [whitespace/operators] [4]
Total errors found: 1 in 2 files


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

[Brent Fulgham]

Created attachment 61307 [details]
Correct shadow test for (stroke & fill) case.

Update that corrects some style warnings.

[WebKit Review Bot]

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

Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
WebCore/platform/graphics/cairo/FontCairo.cpp:76:  Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side.  [whitespace/operators] [4]
Total errors found: 1 in 2 files


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

[Brent Fulgham]

Created attachment 61308 [details]
Correct style warnings.

Attach the correct file this time!

[Dirk Schulze]

Comment on attachment 61308 [details]
Correct style warnings.

r=me

[Dirk Schulze]

Please add title and bug link to the changelog

[Martin Robinson]

Committed r63176: <http://trac.webkit.org/changeset/63176>