summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 23:12:36 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-08 23:12:36 +0000
commita96af9d3a9feb46c463399438d9687c7c10a9451 (patch)
treedeb3bae9cef51ee9be5f3d91837ef97e3e7f7ce2 /webkit
parentc173403c93026f09a74dfd0e2d579191e2fa3ecd (diff)
downloadchromium_src-a96af9d3a9feb46c463399438d9687c7c10a9451.zip
chromium_src-a96af9d3a9feb46c463399438d9687c7c10a9451.tar.gz
chromium_src-a96af9d3a9feb46c463399438d9687c7c10a9451.tar.bz2
Rebaseline a few more tests.
TBR=japhet TESt=none BUG=none Review URL: http://codereview.chromium.org/535004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.pngbin0 -> 6920 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win-vista/LayoutTests/svg/custom/feDisplacementMap-01-expected.txt8
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.pngbin0 -> 4077 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.txt13
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
7 files changed, 15 insertions, 11 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum
new file mode 100644
index 0000000..83c5b12
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum
@@ -0,0 +1 @@
+011d1a4dca87dbb6f1ead7df826846a6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png
new file mode 100644
index 0000000..287018c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win-vista/LayoutTests/svg/custom/feDisplacementMap-01-expected.txt b/webkit/data/layout_tests/platform/chromium-win-vista/LayoutTests/svg/custom/feDisplacementMap-01-expected.txt
deleted file mode 100644
index ff69912..0000000
--- a/webkit/data/layout_tests/platform/chromium-win-vista/LayoutTests/svg/custom/feDisplacementMap-01-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (-0.50,-0.50) size 101x101
- RenderSVGContainer {g} at (-0.50,-0.50) size 101x101
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [filter=ResultImage] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
- RenderPath {rect} at (-0.50,-0.50) size 101x101 [stroke={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum
new file mode 100644
index 0000000..185bd30
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.checksum
@@ -0,0 +1 @@
+b8f474daa25f0e4a4e7e34e4e7c03e9d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png
new file mode 100644
index 0000000..adefc050
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.txt
new file mode 100644
index 0000000..bd105f6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/subtree-layoutstate-transform-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x572
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 673x19
+ text run at (0,0) width 673: "Tests repaint after layout of a subtree, inside a transformed element. You should see a large green square below."
+layer at (28,48) size 100x100
+ RenderBlock {DIV} at (20,40) size 100x100
+layer at (28,48) size 100x100
+ RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 3a09a5e..f2f7bb3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3120,7 +3120,6 @@ BUG31146 WIN LINUX : LayoutTests/svg/custom/grayscale-gradient-mask.svg = IMAGE
// WebKit roll 52633 -> 52667
// New test, needs chromium baseline.
-BUG_DIMICH LINUX WIN : LayoutTests/fast/repaint/subtree-layoutstate-transform.html = IMAGE+TEXT
// New test, needs chromium baseline.
// On Linux, sometimes the text dump matches. Not sure why.
@@ -3133,8 +3132,6 @@ BUG31642 WIN MAC DEBUG: LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t.svg = CRAS
BUG31642 LINUX DEBUG: LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t.svg = IMAGE+TEXT CRASH
// WebKit roll 52852 -> 52867
-BUG_JAPHET WIN : LayoutTests/svg/custom/feDisplacementMap-01.svg = TEXT
-BUG_JAPHET WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
BUG_JAPHET : LayoutTests/websocket/tests/frame-lengths.html = PASS TIMEOUT
// Flaky crash