summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-10 00:19:59 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-10 00:19:59 +0000
commit2ad7b1865b9c1d193f1649cef234d76f5dc78f15 (patch)
treedc3d4ba9c212edbb665f1a6bace2a02134a41757
parent2d376201960a0ccbe33e3447fceaf4d544b57caa (diff)
downloadchromium_src-2ad7b1865b9c1d193f1649cef234d76f5dc78f15.zip
chromium_src-2ad7b1865b9c1d193f1649cef234d76f5dc78f15.tar.gz
chromium_src-2ad7b1865b9c1d193f1649cef234d76f5dc78f15.tar.bz2
Rebaseline new layout tests added upstream: http://trac.webkit.org/changeset/50184
R=japhet TEST=none BUG=none Review URL: http://codereview.chromium.org/371087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31515 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/inline-relative-positioned-expected.txt15
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 15 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/inline-relative-positioned-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..3502b86
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/inline-relative-positioned-expected.txt
@@ -0,0 +1,15 @@
+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 784x584
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,88) size 100x19
+ RenderInline (relative positioned) {SPAN} at (0,0) size 100x19
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,88) size 100x100
+ RenderBlock {DIV} at (0,0) size 100x100 [color=#008000] [bgcolor=#FF0000]
+ RenderText {#text} at (0,0) size 100x100
+ text run at (0,0) width 100: "a"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 73666e8..5eecceb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3022,9 +3022,6 @@ BUG_JORLOW LINUX : LayoutTests/fast/multicol/column-rules-stacking.html = PASS F
// WebKit 50158:50171
BUG_JORLOW : LayoutTests/fast/dom/error-to-string-stack-overflow.html = FAIL
-// WebKit roll 50180:50186
-BUG_JORLOW LINUX WIN : LayoutTests/fast/repaint/inline-relative-positioned.html = FAIL
-
// Not sure when this started being flaky
BUG_JAPHET LINUX : LayoutTests/svg/custom/viewport-update2.svg = PASS FAIL