Changeset 83936 in webkit

Timestamp:

Apr 14, 2011 8:18:36 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Kenneth Russell.

fix shadows with gradients
​https://bugs.webkit.org/show_bug.cgi?id=58376

No new tests. Existing tests exercise this
LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.html

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

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (modified) (4 diffs)
• WebKit/chromium/DEPS (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Mike Reed  <reed@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        fix shadows with gradients
+        https://bugs.webkit.org/show_bug.cgi?id=58376
+
+        No new tests. Existing tests exercise this
+        LayoutTests/fast/canvas/canvas-fillPath-gradient-shadow.html
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::setPlatformShadow):
+
 2011-04-14  Vsevolod Vlasov  <vsevik@chromium.org>
 

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

@@ -45 +45 @@
 
 #include "SkBitmap.h"
-#include "SkBlurDrawLooper.h"
+#include "SkBlurMaskFilter.h"
+#include "SkColorFilter.h"
 #include "SkCornerPathEffect.h"
+#include "SkLayerDrawLooper.h"
 #include "SkShader.h"
 #include "SkiaUtils.h"
@@ -1045 +1047 @@
     double blur = blurFloat;
 
-    uint32_t blurFlags = SkBlurDrawLooper::kHighQuality_BlurFlag | 
-        SkBlurDrawLooper::kOverrideColor_BlurFlag;
+    uint32_t mfFlags = SkBlurMaskFilter::kHighQuality_BlurFlag;
 
     if (m_state.shadowsIgnoreTransforms)  {
@@ -1053 +1054 @@
         // Transforms. So with this flag set, we know this state is associated
         // with a CanvasRenderingContext.
-        blurFlags |= SkBlurDrawLooper::kIgnoreTransform_BlurFlag;
-        
+        mfFlags |= SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
+
         // CG uses natural orientation for Y axis, but the HTML5 canvas spec
         // does not.
@@ -1070 +1071 @@
     // TODO(tc): Should we have a max value for the blur?  CG clamps at 1000.0
     // for perf reasons.
-    SkDrawLooper* dl = new SkBlurDrawLooper(blur / 2, width, height, c, blurFlags);
+
+    SkLayerDrawLooper* dl = new SkLayerDrawLooper;
+    SkAutoUnref aur(dl);
+
+    // top layer, we just draw unchanged
+    dl->addLayer();
+
+    // lower layer contains our offset, blur, and colorfilter
+    SkLayerDrawLooper::LayerInfo info;
+
+    info.fPaintBits |= SkLayerDrawLooper::kMaskFilter_Bit; // our blur
+    info.fPaintBits |= SkLayerDrawLooper::kColorFilter_Bit;
+    info.fColorMode = SkXfermode::kDst_Mode;
+    info.fOffset.set(width, height);
+    info.fPostTranslate = m_state.shadowsIgnoreTransforms;
+
+    SkMaskFilter* mf = SkBlurMaskFilter::Create(blur / 2, SkBlurMaskFilter::kNormal_BlurStyle, mfFlags);
+
+    SkColorFilter* cf = SkColorFilter::CreateModeFilter(c, SkXfermode::kSrcIn_Mode);
+
+    SkPaint* paint = dl->addLayer(info);
+    SkSafeUnref(paint->setMaskFilter(mf));
+    SkSafeUnref(paint->setColorFilter(cf));
+
+    // dl is now built, just install it
     platformContext()->setDrawLooper(dl);
-    dl->unref();
 }
 

trunk/Source/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '81341'
+  'chromium_rev': '81564'
 }