summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 21:51:20 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 21:51:20 +0000
commit4e25d214a2be8380501a1b1d9dcd958cb5778f19 (patch)
treeb2717f08de3bae15b84417afe10b7ff6faadd022 /webkit
parent997a47ac989abd294e94f8384f1eba6ad5698ad2 (diff)
downloadchromium_src-4e25d214a2be8380501a1b1d9dcd958cb5778f19.zip
chromium_src-4e25d214a2be8380501a1b1d9dcd958cb5778f19.tar.gz
chromium_src-4e25d214a2be8380501a1b1d9dcd958cb5778f19.tar.bz2
Rebaseline svg/filters/feComposite.svg, mark it as Flaky for LINUX DEBUG.
TBR=senorblanco TEST=none BUG=32432 Review URL: http://codereview.chromium.org/543090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.pngbin4983 -> 5283 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.pngbin3319 -> 3632 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.txt6
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt12
6 files changed, 10 insertions, 12 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.checksum
index f3fdcbf..640881e 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.checksum
@@ -1 +1 @@
-9e6aa7264555e044b09d3a594916811c \ No newline at end of file
+5994b66db50e27bf6e9b6e559f53ab00 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.png
index e5cad1d..90d248e 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/filters/feComposite-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.checksum
index d482be6..7870761 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.checksum
@@ -1 +1 @@
-0804611bcbbea70ff680fcd47bfe0778 \ No newline at end of file
+53875e33e34afb822ca57a0d6f077c2d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.png
index 9583166..67c4490 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.txt
index adbd58b..973ff42 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/filters/feComposite-expected.txt
@@ -1,3 +1,9 @@
+KCanvasResource {id="over" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="in" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="out" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="atop" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="xor" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
+KCanvasResource {id="arithmetic" [type=FILTER] [bounding box=at (0,0) size 0x0] [bounding box mode=0]}
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 400x400
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 8edeeca..41b289f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2352,10 +2352,6 @@ BUG11795 : http/tests/misc/favicon-as-image.html = FAIL
// Already baselined for chromium-win, may need to be done for mac/linux as well.
BUG11796 LINUX : fast/forms/search-styled.html = FAIL
-// Flaky Windows/Linux Tests
-BUG11898 : svg/dom/SVGScriptElement/script-set-href.svg = FAIL PASS
-BUG11898 WIN DEBUG : http/tests/misc/submit-get-in-utf16le.html = TIMEOUT PASS
-
// Need LINUX/Mac rebaselines after WebKit Update 437150:43770
BUG12053 MAC : editing/execCommand/outdent-blockquote-test1.html = FAIL
BUG12053 MAC : editing/execCommand/outdent-blockquote-test2.html = FAIL
@@ -2837,9 +2833,6 @@ BUG29748 LINUX : tables/mozilla_expected_failures/other/test4.html = IMAGE
BUG29748 WIN DEBUG : fast/forms/input-align-image.html = IMAGE+TEXT PASS
// More Webkit Roll to r51875
-BUG29737 LINUX : svg/filters/feComposite.svg = FAIL TIMEOUT CRASH
-
-// More Webkit Roll to r51875
BUG29737 MAC : svg/W3C-SVG-1.1/filters-blend-01-b.svg = IMAGE+TEXT
BUG29737 MAC : svg/W3C-SVG-1.1/filters-color-01-b.svg = IMAGE+TEXT
BUG29737 MAC : svg/W3C-SVG-1.1/filters-comptran-01-b.svg = IMAGE+TEXT
@@ -2866,9 +2859,8 @@ BUG29737 MAC : svg/W3C-SVG-1.1/struct-image-02-b.svg = IMAGE
BUG29737 MAC : svg/filters/sourceAlpha.svg = IMAGE+TEXT
// More Webkit Roll to r51875
-BUG29737 : svg/dom/operatorAttribute.html = TEXT
-
-BUG29737 WIN : svg/filters/feComposite.svg = FAIL TIMEOUT CRASH
+BUG32425 : svg/dom/operatorAttribute.html = TEXT
+BUG32432 LINUX DEBUG : svg/filters/feComposite.svg = TIMEOUT PASS
// WebKit Roll to r51915
BUG29930 : fast/loader/input-element-page-cache-crash.html = TIMEOUT PASS