summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 08:14:53 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 08:14:53 +0000
commit6b9540882ccacb7f9a41f84f2e8fb221ec6e1406 (patch)
tree279d66c64e5869ce7d655a03226f52b18280bdc8 /webkit
parentcf95f9873bafa2bbfdc05af87219c794b6e4324b (diff)
downloadchromium_src-6b9540882ccacb7f9a41f84f2e8fb221ec6e1406.zip
chromium_src-6b9540882ccacb7f9a41f84f2e8fb221ec6e1406.tar.gz
chromium_src-6b9540882ccacb7f9a41f84f2e8fb221ec6e1406.tar.bz2
Rebasline of float-in-trailing-whitespace-after-last-line-break-2.
A different point from Mac expectation is the height of <br>. BUG=32672 TEST=none Review URL: http://codereview.chromium.org/543151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt11
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt1
2 files changed, 11 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt
new file mode 100644
index 0000000..0868792
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2-expected.txt
@@ -0,0 +1,11 @@
+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
+ RenderImage {IMG} at (0,0) size 100x100
+ RenderBlock {DIV} at (0,0) size 784x100
+ RenderBR {BR} at (100,0) size 0x19
+ RenderImage {IMG} at (0,100) size 100x100
+ RenderText {#text} at (0,0) size 0x0
+ RenderImage {IMG} at (100,100) size 100x100 [bgcolor=#0000FF]
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bfe3464..c02f4e7 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3019,7 +3019,6 @@ BUG53331 : fast/gradients/border-image-gradient-sides-and-corners.html = FAIL
// WebKit roll 53341:53451
BUG32670 LINUX : fast/css/zoom-body-scroll.html = TEXT
BUG32671 WIN LINUX MAC : fast/dom/Window/timer-null-script-execution-context.html = TEXT
-BUG32672 WIN LINUX : fast/dynamic/float-in-trailing-whitespace-after-last-line-break-2.html = TEXT
BUG32673 WIN LINUX : fast/forms/textarea-scrollbar-height.html = TEXT
BUG32674 WIN LINUX MAC : http/tests/security/setDomainRelaxationForbiddenForURLScheme.html = TEXT
BUG32675 LINUX : fast/repaint/trailing-floats-root-line-box-overflow.html = IMAGE