Changeset 84535 in webkit

Timestamp:

Apr 21, 2011 12:09:37 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-21 Mike Reed <​reed@google.com>

Reviewed by Kenneth Russell.

[chromium, win] Multiple failures of shadow rendering layout tests
​https://bugs.webkit.org/show_bug.cgi?id=58772

No new tests. This CL fixes a regression in the following tests
fast/multicol/shadow-breaking.html
fast/repaint/shadow-multiple-horizontal.html
fast/repaint/shadow-multiple-strict-horizontal.html
fast/repaint/shadow-multiple-strict-vertical.html
fast/repaint/shadow-multiple-vertical.html
fast/text/shadow-translucent-fill.html
fast/transforms/shadows.html
svg/css/group-with-shadow.svg
svg/css/shadow-changes.svg
svg/css/text-shadow-multiple.xhtml
transitions/svg-text-shadow-transition.html
svg/css/composite-shadow-text.svg

• platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::setPlatformShadow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/GraphicsContextSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Mike Reed  <reed@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium, win] Multiple failures of shadow rendering layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=58772
+
+        No new tests. This CL fixes a regression in the following tests
+        fast/multicol/shadow-breaking.html
+        fast/repaint/shadow-multiple-horizontal.html
+        fast/repaint/shadow-multiple-strict-horizontal.html
+        fast/repaint/shadow-multiple-strict-vertical.html
+        fast/repaint/shadow-multiple-vertical.html
+        fast/text/shadow-translucent-fill.html
+        fast/transforms/shadows.html
+        svg/css/group-with-shadow.svg
+        svg/css/shadow-changes.svg
+        svg/css/text-shadow-multiple.xhtml
+        transitions/svg-text-shadow-transition.html
+        svg/css/composite-shadow-text.svg
+ 
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::setPlatformShadow):
+
 2011-04-21  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

@@ -1081 +1081 @@
     SkLayerDrawLooper::LayerInfo info;
 
+    /*
+        WebKit's interpretation of shadow color is that it does not pay
+        attention to the alpha in the fill color, so we pass kSrc_Mode for
+        fColorMode so that we overwrite the drawing paint's color and use ours,
+        which is 0xFF000000. This works fine, since by passing kSrcIn_Mode to
+        the colorfilter, we will only modulate with the alpha, which is 0xFF.
+     */
     info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit; // our blur
     info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
-    info.fColorMode = SkXfermode::kDst_Mode;
+    info.fColorMode = SkXfermode::kSrc_Mode;
     info.fOffset.set(width, height);
     info.fPostTranslate = m_state.shadowsIgnoreTransforms;