[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 78a9fc20da87db2dee57125da234419189f0b0fe
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 05:53:03 2010 +0000

    2010-12-13  Mike Lawther  <mikelawther at chromium.org>
    
            Reviewed by Daniel Bates.
    
            [skia] ignore transform for canvas shadows
            https://bugs.webkit.org/show_bug.cgi?id=50437
    
            * platform/graphics/skia/GraphicsContextSkia.cpp:
            (WebCore::GraphicsContext::setPlatformShadow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74001 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 2dc823b..ab1b67c 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2390,7 +2390,6 @@ BUGWK45991 LINUX WIN : canvas/philip/tests/2d.shadow.image.transparent.2.html =
 BUGWK45991 LINUX WIN : canvas/philip/tests/2d.shadow.pattern.alpha.html = TEXT
 BUGWK45991 LINUX WIN : canvas/philip/tests/2d.shadow.pattern.basic.html = TEXT
 BUGWK45991 LINUX WIN : canvas/philip/tests/2d.shadow.pattern.transparent.2.html = TEXT
-BUGWK45991 LINUX WIN : canvas/philip/tests/2d.shadow.transform.2.html = TEXT
 BUGWK45991 LINUX WIN : canvas/philip/tests/2d.transformation.setTransform.skewed.html = TEXT
 BUGWK45991 LINUX WIN : canvas/philip/tests/2d.transformation.transform.skewed.html = TEXT
 
@@ -3032,8 +3031,6 @@ BUG_LOISLO WIN LINUX : fast/canvas/canvas-drawImage-shadow.html = TEXT
 
 BUGWK50112 WIN LINUX : fast/canvas/canvas-createPattern-fillRect-shadow.html = TEXT
 
-BUGCR64647 WIN LINUX : fast/canvas/canvas-scale-fillRect-shadow.html = TEXT
-BUGCR64647 WIN LINUX : fast/canvas/canvas-scale-fillPath-shadow.html = TEXT
 BUGCR64647 WIN LINUX : fast/canvas/canvas-scale-strokePath-shadow.html = TEXT
 BUGCR64647 WIN LINUX : fast/canvas/canvas-scale-drawImage-shadow.html = TEXT
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5728064..3818e2b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13  Mike Lawther  <mikelawther at chromium.org>
+
+        Reviewed by Daniel Bates.
+
+        [skia] ignore transform for canvas shadows
+        https://bugs.webkit.org/show_bug.cgi?id=50437
+
+        * platform/graphics/skia/GraphicsContextSkia.cpp:
+        (WebCore::GraphicsContext::setPlatformShadow):
+
 2010-12-13  Dai Mikurube  <dmikurube at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
index 2113fd6..1b217ee 100644
--- a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -1066,13 +1066,15 @@ void GraphicsContext::setPlatformShadow(const FloatSize& size,
     double height = size.height();
     double blur = blurFloat;
 
-    // TODO(tc): This still does not address the issue that shadows
-    // within canvas elements should ignore transforms.
+    SkBlurDrawLooper::BlurFlags blurFlags = SkBlurDrawLooper::kNone_BlurFlag;
+
     if (m_state.shadowsIgnoreTransforms)  {
         // Currently only the GraphicsContext associated with the
         // CanvasRenderingContext for HTMLCanvasElement have shadows ignore
         // Transforms. So with this flag set, we know this state is associated
         // with a CanvasRenderingContext.
+        blurFlags = SkBlurDrawLooper::kIgnoreTransform_BlurFlag;
+        
         // CG uses natural orientation for Y axis, but the HTML5 canvas spec
         // does not.
         // So we now flip the height since it was flipped in
@@ -1088,7 +1090,7 @@ void GraphicsContext::setPlatformShadow(const FloatSize& size,
 
     // 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);
+    SkDrawLooper* dl = new SkBlurDrawLooper(blur / 2, width, height, c, blurFlags);
     platformContext()->setDrawLooper(dl);
     dl->unref();
 }

-- 
WebKit Debian packaging