summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 01:13:10 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 01:13:10 +0000
commit9ecbadb8e1c370cdc787898a1598abc12a202bbe (patch)
tree46f8ef9dbcb9ba2eb941fbc1e71e90fb7cb7eee3 /webkit
parentcb0eaf2eeaa1894ccba4bc58896bcfbab092e14b (diff)
downloadchromium_src-9ecbadb8e1c370cdc787898a1598abc12a202bbe.zip
chromium_src-9ecbadb8e1c370cdc787898a1598abc12a202bbe.tar.gz
chromium_src-9ecbadb8e1c370cdc787898a1598abc12a202bbe.tar.bz2
Rebaseline canvas-empty-image-pattern, which is passing.
TBR=japhet TEST=none BUG=none Review URL: http://codereview.chromium.org/542022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.pngbin0 -> 2797 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.txt8
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
4 files changed, 9 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.checksum
new file mode 100644
index 0000000..7ae78ac
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.checksum
@@ -0,0 +1 @@
+0a238cdba70de30f8d735dbc8a85c8e6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.png
new file mode 100644
index 0000000..c2ff6dd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.txt
new file mode 100644
index 0000000..f254de2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-empty-image-pattern-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x121
+ RenderBlock {HTML} at (0,0) size 800x121
+ RenderBody {BODY} at (8,8) size 784x105
+ RenderHTMLCanvas {CANVAS} at (0,0) size 100x100
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1c77927..6448496 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1196,10 +1196,6 @@ BUG3273 : LayoutTests/editing/selection/mixed-editability-10.html = FAIL
// Regression from the 41362:41402 merge.
BUG8402 MAC : LayoutTests/fast/forms/drag-out-of-textarea.html = FAIL
-// These tests are flaky as of 2009/06/09. Need to investigate.
-
-// <body><canvas height=100></canvas></body> is 1 px taller than upstream.
-BUG13809 WIN LINUX : LayoutTests/fast/canvas/canvas-empty-image-pattern.html = FAIL
// GURL doesn't handle switching from standard URL to path URL correctly
BUG27914 : LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-protocol.html = TEXT