Changeset 80519 in webkit

Timestamp:

Mar 7, 2011 6:09:51 PM (13 years ago)

Author:

ukai@chromium.org

Message:

2011-03-07 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r80514.
​http://trac.webkit.org/changeset/80514
​https://bugs.webkit.org/show_bug.cgi?id=55915

Caused assertion failures (Requested by ukai on #webkit).

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-07  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r80514.
+        http://trac.webkit.org/changeset/80514
+        https://bugs.webkit.org/show_bug.cgi?id=55915
+
+        Caused assertion failures (Requested by ukai on #webkit).
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::setPlatformShadow):
+        * platform/graphics/skia/ImageSkia.cpp:
+        (WebCore::paintSkBitmap):
+
 2011-03-07  Cosmin Truta  <ctruta@chromium.org>
 

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

@@ -1036 +1036 @@
     double blur = blurFloat;
 
-    uint32_t blurFlags = SkBlurDrawLooper::kHighQuality_BlurFlag | 
-        SkBlurDrawLooper::kOverrideColor_BlurFlag;
+    SkBlurDrawLooper::BlurFlags blurFlags = SkBlurDrawLooper::kNone_BlurFlag;
 
     if (m_state.shadowsIgnoreTransforms)  {
@@ -1044 +1043 @@
         // Transforms. So with this flag set, we know this state is associated
         // with a CanvasRenderingContext.
-        blurFlags |= SkBlurDrawLooper::kIgnoreTransform_BlurFlag;
+        blurFlags = SkBlurDrawLooper::kIgnoreTransform_BlurFlag;
         
         // CG uses natural orientation for Y axis, but the HTML5 canvas spec

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

@@ -261 +261 @@
     paint.setFilterBitmap(true);
     paint.setAlpha(platformContext->getNormalizedAlpha());
-    paint.setLooper(platformContext->getDrawLooper());
 
     skia::PlatformCanvas* canvas = platformContext->canvas();