More layout test hygiene.

Give canvas-getImageData.html the correct bug ID, and update the comment.
fillrect_gradient.html rebaselined (slight pixel differences in the linear gradients).
canvas-text-alignment rebaselined (slight pixel coverage differences; the gradient is actually correct according to mac results).

BUG=10428,10435
TEST=green bots
TBR=dglazkov
Review URL: http://codereview.chromium.org/377025

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

7 files changed, 6 insertions, 11 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.checksum
index 3612f9f..66561e3 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.checksum
@@ -1 +1 @@
-882ccef042f8b4f87ee8aa8b94e7d837
\ No newline at end of file
+1d75bbe49e9635356cae1da58c7c1ed9
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.png
index 0c1c138..4b49c44 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-text-alignment-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
index 412f2eb..e8f26d4 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
@@ -1 +1 @@
-b354a14f44b58a92621036941aa76180
\ No newline at end of file
+03f017d95309f444edce0423a85a5716
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.png
index 22b3697..81a99ad 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/fillrect_gradient-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
index 200046e..2f5aa68 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.checksum
@@ -1 +1 @@
-f07a2050053ed4a7b23c419b808c939e
\ No newline at end of file
+f313e84c6bd2382e53508f006a8f6839
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.png
index 54c3d36..9aa6c55 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/fillrect_gradient-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1d6678c..1e781dc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1207,9 +1207,9 @@ BUG24209 : LayoutTests/fast/js/pic/cached-prototype-setter.html = FAIL
 BUG10317 LINUX : LayoutTests/fast/css/shadow-multiple.html = FAIL
 
 // Problems with getImageData and toDataURL.
-// We should fix this test, but it wasn't passing for the 1.0 release, so
-// it doesn't need to block the current release
-BUG2972 LINUX WIN : LayoutTests/fast/canvas/canvas-getImageData.html = FAIL
+// This test requires us to do alpha blending exactly the way CG does it,
+// which Skia may never do (see bug).
+BUG22700 LINUX WIN : LayoutTests/fast/canvas/canvas-getImageData.html = FAIL
 
 // We're much closer now. To fully pass this we need encoders for jpg
 // and gif, which is a low priority.
@@ -2322,9 +2322,6 @@ BUG10426 LINUX : LayoutTests/fast/css-generated-content/beforeAfter-interdocumen
 // Selection highlight colors are wrong.
 BUG10426 LINUX : LayoutTests/fast/lists/drag-into-marker.html = FAIL
 
-// Flaky since the merge 41017:41057.
-BUG10428 WIN LINUX : LayoutTests/fast/canvas/fillrect_gradient.html = IMAGE
-
 // It's not clear that the test isn't wrong here. It believes that middle
 // aligning 15px Ahem should end up in a certain spot. But we have the
 // x-height correct and we're still one px off.
@@ -2343,8 +2340,6 @@ BUG10430 LINUX WIN : LayoutTests/svg/text/text-intro-05-t.svg = FAIL
 BUG10434 LINUX : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
 
 // Regression from merge 41268:41286
-// We don't render linear gradient on text stroke.
-BUG10435 LINUX : LayoutTests/fast/canvas/canvas-text-alignment.html = FAIL
 // See above comment about this test on linux/win.
 BUG10435 MAC : LayoutTests/editing/selection/designmode-no-caret.html = FAIL
 // IMAGE+TEXT is flaky