Fix some shadow tests by allowing a 0 blur shadow

and having the height offset reversed.

These work now that we pull in webkit @r39105.
http://trac.webkit.org/changeset/39105

The images need to be rebaselined due to some text on the page, but the shadows match.

BUG=2969

Review URL: http://codereview.chromium.org/14089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6950 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 89 insertions, 20 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.checksum
new file mode 100755
index 0000000..901fe227
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.checksum
@@ -0,0 +1 @@
+86314184c71159cf2338c7eaafce29c2
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.png
new file mode 100755
index 0000000..b604ede
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-1-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.checksum
new file mode 100755
index 0000000..f98a34ed
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.checksum
@@ -0,0 +1 @@
+37d9a23cd195314119fc5bfc8a102054
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.png
new file mode 100755
index 0000000..6909988
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-2-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.checksum
new file mode 100755
index 0000000..901fe227
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.checksum
@@ -0,0 +1 @@
+86314184c71159cf2338c7eaafce29c2
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.png
new file mode 100755
index 0000000..b604ede
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-3-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.checksum
new file mode 100755
index 0000000..4e792e3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.checksum
@@ -0,0 +1 @@
+5ad227e841f1a85d9ac0c6803dd43771
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.png
new file mode 100755
index 0000000..eed4be6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-4-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.checksum
new file mode 100755
index 0000000..4e792e3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.checksum
@@ -0,0 +1 @@
+5ad227e841f1a85d9ac0c6803dd43771
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.png
new file mode 100755
index 0000000..eed4be6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-5-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.checksum
new file mode 100755
index 0000000..789c585
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.checksum
@@ -0,0 +1 @@
+4666dc7581e82c9511830589007ce0a4
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.png
new file mode 100755
index 0000000..12ddc5c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.txt
new file mode 100755
index 0000000..4cf89a8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/shadow-offset-6-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x465

+  RenderBlock {HTML} at (0,0) size 800x465

+    RenderBody {BODY} at (8,16) size 784x441

+      RenderBlock {P} at (0,0) size 784x20

+        RenderText {#text} at (0,0) size 223x19

+          text run at (0,0) width 223: "There should be no red pixels below."

+      RenderBlock (anonymous) at (0,36) size 784x405

+        RenderHTMLCanvas {CANVAS} at (0,0) size 400x400 [bgcolor=#FFFFFF]

+        RenderText {#text} at (0,0) size 0x0

+        RenderText {#text} at (0,0) size 0x0

diff --git a/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
index 7f78bab..6bd586d 100644
--- a/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/webkit/port/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -936,20 +936,17 @@ void GraphicsContext::setPlatformShadow(const IntSize& size,
     if (paintingDisabled())
         return;
 
-    if (blur > 0) {
-        SkColor c;
-        if (color.isValid())
-            c = color.rgb();
-        else
-            c = SkColorSetARGB(0xFF/3, 0, 0, 0);    // "std" apple shadow color.
-        SkDrawLooper* dl = new SkBlurDrawLooper(SkIntToScalar(blur),
-                                                SkIntToScalar(size.width()),
-                                                SkIntToScalar(size.height()),
-                                                c);
-        platformContext()->setDrawLooper(dl);
-        dl->unref();
-    } else
-        platformContext()->setDrawLooper(0);
+    SkColor c;
+    if (color.isValid())
+        c = color.rgb();
+    else
+        c = SkColorSetARGB(0xFF/3, 0, 0, 0);    // "std" apple shadow color.
+    SkDrawLooper* dl = new SkBlurDrawLooper(SkIntToScalar(blur),
+                                            SkIntToScalar(size.width()),
+                                            SkIntToScalar(-size.height()),
+                                            c);
+    platformContext()->setDrawLooper(dl);
+    dl->unref();
 }
 
 void GraphicsContext::setPlatformStrokeColor(const Color& strokecolor)
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 3b05bcc..74dd10b 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -555,12 +555,6 @@ LayoutTests/fast/js/pic/cached-prototype-setter.html = FAIL
 
 // Shadows don't render correctly for these tests.
 // http://code.google.com/p/chromium/issues/detail?id=2969
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-1.html = FAIL
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-2.html = FAIL
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-3.html = FAIL
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-4.html = FAIL
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-5.html = FAIL
-LINUX WIN : LayoutTests/fast/canvas/shadow-offset-6.html = FAIL
 LINUX WIN : LayoutTests/fast/canvas/shadow-offset-7.html = FAIL
 LINUX WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL