summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-11 23:25:55 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-11 23:25:55 +0000
commit5acdfef617e0c2dd01467420d1469f4ebfb37791 (patch)
treef104e2f8917b70f5110ba9f1e1a83ec6d97e30bf /webkit
parent9263944688de80b3ffe38bbc3c7a85124a2f4c92 (diff)
downloadchromium_src-5acdfef617e0c2dd01467420d1469f4ebfb37791.zip
chromium_src-5acdfef617e0c2dd01467420d1469f4ebfb37791.tar.gz
chromium_src-5acdfef617e0c2dd01467420d1469f4ebfb37791.tar.bz2
The test LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html removes an IFrame from a document.
On Mac, they have the IFrame in the tree dump, we don't in our baseline. It is OK to have the IFrame in the dump. Rebaselining. Review URL: http://codereview.chromium.org/20271 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.pngbin3268 -> 3383 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt10
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt6
4 files changed, 9 insertions, 9 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
index 73a6d93..7a46692 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.checksum
@@ -1 +1 @@
-a44c6d6adf64caab4d736b0dbf5bf304 \ No newline at end of file
+5bca8afd3bb82d5703a4e72af5e513f9 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
index 99b54ce..7973e4d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
index 1f85305..312e509 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
@@ -2,10 +2,16 @@ 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 784x576
+ RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 204x19
text run at (0,0) width 204: "This test passes if it doesn't crash!"
- RenderBlock (anonymous) at (0,36) size 784x0
+ RenderBlock (anonymous) at (0,36) size 784x154
+ RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+ layer at (0,0) size 300x150
+ RenderView at (0,0) size 300x150
+ layer at (0,0) size 300x8
+ RenderBlock {HTML} at (0,0) size 300x8
+ RenderBody {BODY} at (8,8) size 284x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 4e979b9..cb09a97 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1661,12 +1661,6 @@ MAC : LayoutTests/fast/forms/menulist-no-overflow.html = FAIL
WIN LINUX : LayoutTests/editing/selection/move-by-line-001.html = PASS FAIL
MAC : LayoutTests/fast/forms/002.html = FAIL
-// Merge 40124:40164 -- regressions
-// This test tries to remove an iframe on the page then generate the pixel
-// output. For some reason, we're taking the snapshot before the iframe is
-// removed (maybe getting the clientWidth isn't causing a re-layout?)
-WIN : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
-
// Flakey tests
LINUX : LayoutTests/transitions/shorthand-transitions.html = FAIL PASS