Title: [89250] trunk/Source/WebCore
Revision
89250
Author
[email protected]
Date
2011-06-20 09:37:46 -0700 (Mon, 20 Jun 2011)

Log Message

2011-06-20  Mike Reed  <[email protected]>

        Reviewed by Stephen White.

        [Skia] remove repeated calls to setColor, which ignored global-alpha (previous setupPaintFor... already set the color+alpha)
        https://bugs.webkit.org/show_bug.cgi?id=62988

        No new tests. removing redundant calls

        * platform/graphics/chromium/FontLinux.cpp:
        (WebCore::Font::drawGlyphs):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (89249 => 89250)


--- trunk/Source/WebCore/ChangeLog	2011-06-20 16:25:10 UTC (rev 89249)
+++ trunk/Source/WebCore/ChangeLog	2011-06-20 16:37:46 UTC (rev 89250)
@@ -1,3 +1,15 @@
+2011-06-20  Mike Reed  <[email protected]>
+
+        Reviewed by Stephen White.
+
+        [Skia] remove repeated calls to setColor, which ignored global-alpha (previous setupPaintFor... already set the color+alpha)
+        https://bugs.webkit.org/show_bug.cgi?id=62988
+
+        No new tests. removing redundant calls
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::Font::drawGlyphs):
+
 2011-06-19  Martin Robinson  <[email protected]>
 
         Reviewed by Xan Lopez.

Modified: trunk/Source/WebCore/platform/graphics/chromium/FontLinux.cpp (89249 => 89250)


--- trunk/Source/WebCore/platform/graphics/chromium/FontLinux.cpp	2011-06-20 16:25:10 UTC (rev 89249)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontLinux.cpp	2011-06-20 16:37:46 UTC (rev 89250)
@@ -122,7 +122,6 @@
         font->platformData().setupPaint(&paint);
         adjustTextRenderMode(&paint, gc->platformContext());
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        paint.setColor(gc->fillColor().rgb());
 
         if (isVertical) {
             SkPath path;
@@ -145,12 +144,12 @@
         font->platformData().setupPaint(&paint);
         adjustTextRenderMode(&paint, gc->platformContext());
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        paint.setColor(gc->strokeColor().rgb());
 
         if (textMode & TextModeFill) {
             // If we also filled, we don't want to draw shadows twice.
             // See comment in FontChromiumWin.cpp::paintSkiaText() for more details.
-            SkSafeUnref(paint.setLooper(0));
+            // Since we use the looper for shadows, we remove it (if any) now.
+            paint.setLooper(0);
         }
 
         if (isVertical) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to