summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 23:18:22 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 23:18:22 +0000
commit76d2816ad27088432ce9d946facfaa091151dcf6 (patch)
treee7e3fbb698089f2b40f48f2069ed48c9120e7c6e
parent64340b1507129fc1f0cab1aca65ca30b63b89202 (diff)
downloadchromium_src-76d2816ad27088432ce9d946facfaa091151dcf6.zip
chromium_src-76d2816ad27088432ce9d946facfaa091151dcf6.tar.gz
chromium_src-76d2816ad27088432ce9d946facfaa091151dcf6.tar.bz2
9 more layout tests taken off the pile.
The tests below have had their baseline changed upstream and we need to follow suit (see diffs in review folder): -LayoutTests/fast/events/offsetX-offsetY.html -LayoutTests/editing/selection/select-from-textfield-outwards.html -LayoutTests/editing/selection/select-missing-image.html NOTE: For the last test above, we now match the mac baseline so I just removed our text baseline. New tests that just needed to be baselined (only differ in font metrics): -LayoutTests/fast/lists/list-marker-with-line-height.html -LayoutTests/fast/overflow/overflow-float-stacking.html -LayoutTests/fast/overflow/overflow-stacking.html -LayoutTests/fast/replaced/embed-display-none.html -LayoutTests/fast/replaced/applet-display-none.html -LayoutTests/fast/replaced/object-display-none.html Review URL: http://codereview.chromium.org/28211 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10522 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-from-textfield-outwards-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-missing-image-expected.txt14
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/offsetX-offsetY-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.pngbin0 -> 3631 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.txt10
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.pngbin0 -> 9905 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.txt157
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.pngbin0 -> 9205 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.txt156
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.pngbin0 -> 3801 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.txt8
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.pngbin0 -> 3514 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.txt8
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.pngbin0 -> 3524 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.txt8
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt18
22 files changed, 363 insertions, 27 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-from-textfield-outwards-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-from-textfield-outwards-expected.txt
index deadac0..c9ec251 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-from-textfield-outwards-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-from-textfield-outwards-expected.txt
@@ -8,10 +8,10 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV to 12
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV to 17 of #text > DIV toDOMRange:range from 0 of #text > DIV to 12 of #text > DIV affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV to 12 of #text > DIV toDOMRange:range from 0 of #text > DIV to 12 of #text > DIV affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV to 12 of #text > DIV toDOMRange:range from 11 of #text > DIV to 17 of #text > DIV affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV to 17 of #text > DIV toDOMRange:range from 11 of #text > DIV to 17 of #text > DIV affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV to 17 of #text > DIV toDOMRange:range from 11 of #text > DIV to 17 of #text > DIV affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-missing-image-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-missing-image-expected.txt
deleted file mode 100644
index 9074c269..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/select-missing-image-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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
- RenderBlock {DIV} at (0,0) size 784x128 [border: (2px solid #FF0000)]
- RenderImage {IMG} at (14,14) size 550x100
- RenderText {#text} at (0,0) size 0x0
-selection start: position 0 of child 1 {IMG} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 1 of child 1 {IMG} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/offsetX-offsetY-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/offsetX-offsetY-expected.txt
index 95e0d88..cc7a79c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/offsetX-offsetY-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/offsetX-offsetY-expected.txt
@@ -19,5 +19,4 @@ FAIL: event at (157, 32) expected to hit rel-box at (22, 24) but hit rel-box at
PASS: event at (410, 30) hit fixed-box at offset (10, 10)
FAIL: event at (36, 272) expected to hit with-bordertopextra at (4, 4) but hit filler at (56, 372)
FAIL: event at (563, 410) expected to hit inside-overflow at (7, 6) but hit overflow-contents at (178, 112)
-FAIL: event at (112, 369) expected to hit transformed at (11, 15) but hit transformed at (6, 2)
-
+FAIL: event at (112, 369) expected to hit transformed at (11, 16) but hit transformed at (7, 2)
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.checksum
new file mode 100644
index 0000000..6bda9c2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.checksum
@@ -0,0 +1 @@
+31c68fdf13a105014aca7a5909f095a0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.png
new file mode 100644
index 0000000..4c76181
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.txt
new file mode 100644
index 0000000..88041ca
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/lists/list-marker-with-line-height-expected.txt
@@ -0,0 +1,10 @@
+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
+ RenderBlock {OL} at (0,0) size 784x24
+ RenderListItem {LI} at (40,0) size 744x24
+ RenderListMarker at (-21,2) size 16x19: "1"
+ RenderText {#text} at (0,2) size 384x19
+ text run at (0,2) width 384: "This test passes if the list item and list marker are evenly aligned."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.checksum
new file mode 100644
index 0000000..fc0c5f2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.checksum
@@ -0,0 +1 @@
+2a7792a188b858ea5aab266df71a8ea7 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.png
new file mode 100644
index 0000000..fece3ed
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.txt
new file mode 100644
index 0000000..4275f83
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-float-stacking-expected.txt
@@ -0,0 +1,157 @@
+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 646x19
+ text run at (0,0) width 646: "Make sure that floating overflow:auto/hidden/scroll blocks stack properly with other floats at the same level."
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock (floating) {DIV} at (250,20) size 300x300 [bgcolor=#FFFF00]
+ RenderText {#text} at (0,1) size 295x226
+ text run at (0,1) width 198: "This block"
+ text run at (0,58) width 240: "should be on"
+ text run at (0,115) width 179: "top of the"
+ text run at (0,172) width 295: "overflow block."
+layer at (8,28) size 300x300 clip at (8,28) size 285x300 scrollHeight 939
+ RenderBlock (floating) {DIV} at (0,20) size 300x300 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 71x19
+ text run at (0,0) width 71: "Hello world"
+ RenderBR {BR} at (71,15) size 0x0
+ RenderText {#text} at (0,20) size 71x19
+ text run at (0,20) width 71: "Hello world"
+ RenderBR {BR} at (71,35) size 0x0
+ RenderText {#text} at (0,40) size 71x19
+ text run at (0,40) width 71: "Hello world"
+ RenderBR {BR} at (71,55) size 0x0
+ RenderText {#text} at (0,60) size 71x19
+ text run at (0,60) width 71: "Hello world"
+ RenderBR {BR} at (71,75) size 0x0
+ RenderText {#text} at (0,80) size 71x19
+ text run at (0,80) width 71: "Hello world"
+ RenderBR {BR} at (71,95) size 0x0
+ RenderText {#text} at (0,100) size 71x19
+ text run at (0,100) width 71: "Hello world"
+ RenderBR {BR} at (71,115) size 0x0
+ RenderText {#text} at (0,120) size 71x19
+ text run at (0,120) width 71: "Hello world"
+ RenderBR {BR} at (71,135) size 0x0
+ RenderText {#text} at (0,140) size 71x19
+ text run at (0,140) width 71: "Hello world"
+ RenderBR {BR} at (71,155) size 0x0
+ RenderText {#text} at (0,160) size 71x19
+ text run at (0,160) width 71: "Hello world"
+ RenderBR {BR} at (71,175) size 0x0
+ RenderText {#text} at (0,180) size 71x19
+ text run at (0,180) width 71: "Hello world"
+ RenderBR {BR} at (71,195) size 0x0
+ RenderText {#text} at (0,200) size 71x19
+ text run at (0,200) width 71: "Hello world"
+ RenderBR {BR} at (71,215) size 0x0
+ RenderText {#text} at (0,220) size 71x19
+ text run at (0,220) width 71: "Hello world"
+ RenderBR {BR} at (71,235) size 0x0
+ RenderText {#text} at (0,240) size 71x19
+ text run at (0,240) width 71: "Hello world"
+ RenderBR {BR} at (71,255) size 0x0
+ RenderText {#text} at (0,260) size 71x19
+ text run at (0,260) width 71: "Hello world"
+ RenderBR {BR} at (71,275) size 0x0
+ RenderText {#text} at (0,280) size 71x19
+ text run at (0,280) width 71: "Hello world"
+ RenderBR {BR} at (71,295) size 0x0
+ RenderText {#text} at (0,300) size 71x19
+ text run at (0,300) width 71: "Hello world"
+ RenderBR {BR} at (71,315) size 0x0
+ RenderText {#text} at (0,320) size 71x19
+ text run at (0,320) width 71: "Hello world"
+ RenderBR {BR} at (71,335) size 0x0
+ RenderText {#text} at (0,340) size 71x19
+ text run at (0,340) width 71: "Hello world"
+ RenderBR {BR} at (71,355) size 0x0
+ RenderText {#text} at (0,360) size 71x19
+ text run at (0,360) width 71: "Hello world"
+ RenderBR {BR} at (71,375) size 0x0
+ RenderText {#text} at (0,380) size 71x19
+ text run at (0,380) width 71: "Hello world"
+ RenderBR {BR} at (71,395) size 0x0
+ RenderText {#text} at (0,400) size 71x19
+ text run at (0,400) width 71: "Hello world"
+ RenderBR {BR} at (71,415) size 0x0
+ RenderText {#text} at (0,420) size 71x19
+ text run at (0,420) width 71: "Hello world"
+ RenderBR {BR} at (71,435) size 0x0
+ RenderText {#text} at (0,440) size 71x19
+ text run at (0,440) width 71: "Hello world"
+ RenderBR {BR} at (71,455) size 0x0
+ RenderText {#text} at (0,460) size 71x19
+ text run at (0,460) width 71: "Hello world"
+ RenderBR {BR} at (71,475) size 0x0
+ RenderText {#text} at (0,480) size 71x19
+ text run at (0,480) width 71: "Hello world"
+ RenderBR {BR} at (71,495) size 0x0
+ RenderText {#text} at (0,500) size 71x19
+ text run at (0,500) width 71: "Hello world"
+ RenderBR {BR} at (71,515) size 0x0
+ RenderText {#text} at (0,520) size 71x19
+ text run at (0,520) width 71: "Hello world"
+ RenderBR {BR} at (71,535) size 0x0
+ RenderText {#text} at (0,540) size 71x19
+ text run at (0,540) width 71: "Hello world"
+ RenderBR {BR} at (71,555) size 0x0
+ RenderText {#text} at (0,560) size 71x19
+ text run at (0,560) width 71: "Hello world"
+ RenderBR {BR} at (71,575) size 0x0
+ RenderText {#text} at (0,580) size 71x19
+ text run at (0,580) width 71: "Hello world"
+ RenderBR {BR} at (71,595) size 0x0
+ RenderText {#text} at (0,600) size 71x19
+ text run at (0,600) width 71: "Hello world"
+ RenderBR {BR} at (71,615) size 0x0
+ RenderText {#text} at (0,620) size 71x19
+ text run at (0,620) width 71: "Hello world"
+ RenderBR {BR} at (71,635) size 0x0
+ RenderText {#text} at (0,640) size 71x19
+ text run at (0,640) width 71: "Hello world"
+ RenderBR {BR} at (71,655) size 0x0
+ RenderText {#text} at (0,660) size 71x19
+ text run at (0,660) width 71: "Hello world"
+ RenderBR {BR} at (71,675) size 0x0
+ RenderText {#text} at (0,680) size 71x19
+ text run at (0,680) width 71: "Hello world"
+ RenderBR {BR} at (71,695) size 0x0
+ RenderText {#text} at (0,700) size 71x19
+ text run at (0,700) width 71: "Hello world"
+ RenderBR {BR} at (71,715) size 0x0
+ RenderText {#text} at (0,720) size 71x19
+ text run at (0,720) width 71: "Hello world"
+ RenderBR {BR} at (71,735) size 0x0
+ RenderText {#text} at (0,740) size 71x19
+ text run at (0,740) width 71: "Hello world"
+ RenderBR {BR} at (71,755) size 0x0
+ RenderText {#text} at (0,760) size 71x19
+ text run at (0,760) width 71: "Hello world"
+ RenderBR {BR} at (71,775) size 0x0
+ RenderText {#text} at (0,780) size 71x19
+ text run at (0,780) width 71: "Hello world"
+ RenderBR {BR} at (71,795) size 0x0
+ RenderText {#text} at (0,800) size 71x19
+ text run at (0,800) width 71: "Hello world"
+ RenderBR {BR} at (71,815) size 0x0
+ RenderText {#text} at (0,820) size 71x19
+ text run at (0,820) width 71: "Hello world"
+ RenderBR {BR} at (71,835) size 0x0
+ RenderText {#text} at (0,840) size 71x19
+ text run at (0,840) width 71: "Hello world"
+ RenderBR {BR} at (71,855) size 0x0
+ RenderText {#text} at (0,860) size 71x19
+ text run at (0,860) width 71: "Hello world"
+ RenderBR {BR} at (71,875) size 0x0
+ RenderText {#text} at (0,880) size 71x19
+ text run at (0,880) width 71: "Hello world"
+ RenderBR {BR} at (71,895) size 0x0
+ RenderText {#text} at (0,900) size 71x19
+ text run at (0,900) width 71: "Hello world"
+ RenderBR {BR} at (71,915) size 0x0
+ RenderText {#text} at (0,920) size 71x19
+ text run at (0,920) width 71: "Hello world"
+ RenderBR {BR} at (71,935) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.checksum
new file mode 100644
index 0000000..b8fb75c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.checksum
@@ -0,0 +1 @@
+62fe2ada5fa9792eaa6e29809cd01a40 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.png
new file mode 100644
index 0000000..57cbe2f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.txt
new file mode 100644
index 0000000..aba8e86
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/overflow-stacking-expected.txt
@@ -0,0 +1,156 @@
+layer at (0,0) size 785x606
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x606
+ RenderBlock {HTML} at (0,0) size 785x606
+ RenderBody {BODY} at (8,8) size 769x590
+ RenderBlock (anonymous) at (0,0) size 769x40
+ RenderText {#text} at (0,0) size 760x39
+ text run at (0,0) width 760: "Make sure that overflow:auto/hidden/scroll blocks interleave their background and foreground with other overlapping blocks in"
+ text run at (0,20) width 97: "the normal flow."
+ RenderBlock {DIV} at (0,290) size 300x300 [bgcolor=#FFFF00]
+ RenderText {#text} at (0,1) size 171x112
+ text run at (0,1) width 166: "This text"
+ text run at (0,58) width 171: "overlaps."
+layer at (8,48) size 300x300 clip at (8,48) size 285x300 scrollHeight 939
+ RenderBlock {DIV} at (0,40) size 300x300 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 71x19
+ text run at (0,0) width 71: "Hello world"
+ RenderBR {BR} at (71,15) size 0x0
+ RenderText {#text} at (0,20) size 71x19
+ text run at (0,20) width 71: "Hello world"
+ RenderBR {BR} at (71,35) size 0x0
+ RenderText {#text} at (0,40) size 71x19
+ text run at (0,40) width 71: "Hello world"
+ RenderBR {BR} at (71,55) size 0x0
+ RenderText {#text} at (0,60) size 71x19
+ text run at (0,60) width 71: "Hello world"
+ RenderBR {BR} at (71,75) size 0x0
+ RenderText {#text} at (0,80) size 71x19
+ text run at (0,80) width 71: "Hello world"
+ RenderBR {BR} at (71,95) size 0x0
+ RenderText {#text} at (0,100) size 71x19
+ text run at (0,100) width 71: "Hello world"
+ RenderBR {BR} at (71,115) size 0x0
+ RenderText {#text} at (0,120) size 71x19
+ text run at (0,120) width 71: "Hello world"
+ RenderBR {BR} at (71,135) size 0x0
+ RenderText {#text} at (0,140) size 71x19
+ text run at (0,140) width 71: "Hello world"
+ RenderBR {BR} at (71,155) size 0x0
+ RenderText {#text} at (0,160) size 71x19
+ text run at (0,160) width 71: "Hello world"
+ RenderBR {BR} at (71,175) size 0x0
+ RenderText {#text} at (0,180) size 71x19
+ text run at (0,180) width 71: "Hello world"
+ RenderBR {BR} at (71,195) size 0x0
+ RenderText {#text} at (0,200) size 71x19
+ text run at (0,200) width 71: "Hello world"
+ RenderBR {BR} at (71,215) size 0x0
+ RenderText {#text} at (0,220) size 71x19
+ text run at (0,220) width 71: "Hello world"
+ RenderBR {BR} at (71,235) size 0x0
+ RenderText {#text} at (0,240) size 71x19
+ text run at (0,240) width 71: "Hello world"
+ RenderBR {BR} at (71,255) size 0x0
+ RenderText {#text} at (0,260) size 71x19
+ text run at (0,260) width 71: "Hello world"
+ RenderBR {BR} at (71,275) size 0x0
+ RenderText {#text} at (0,280) size 71x19
+ text run at (0,280) width 71: "Hello world"
+ RenderBR {BR} at (71,295) size 0x0
+ RenderText {#text} at (0,300) size 71x19
+ text run at (0,300) width 71: "Hello world"
+ RenderBR {BR} at (71,315) size 0x0
+ RenderText {#text} at (0,320) size 71x19
+ text run at (0,320) width 71: "Hello world"
+ RenderBR {BR} at (71,335) size 0x0
+ RenderText {#text} at (0,340) size 71x19
+ text run at (0,340) width 71: "Hello world"
+ RenderBR {BR} at (71,355) size 0x0
+ RenderText {#text} at (0,360) size 71x19
+ text run at (0,360) width 71: "Hello world"
+ RenderBR {BR} at (71,375) size 0x0
+ RenderText {#text} at (0,380) size 71x19
+ text run at (0,380) width 71: "Hello world"
+ RenderBR {BR} at (71,395) size 0x0
+ RenderText {#text} at (0,400) size 71x19
+ text run at (0,400) width 71: "Hello world"
+ RenderBR {BR} at (71,415) size 0x0
+ RenderText {#text} at (0,420) size 71x19
+ text run at (0,420) width 71: "Hello world"
+ RenderBR {BR} at (71,435) size 0x0
+ RenderText {#text} at (0,440) size 71x19
+ text run at (0,440) width 71: "Hello world"
+ RenderBR {BR} at (71,455) size 0x0
+ RenderText {#text} at (0,460) size 71x19
+ text run at (0,460) width 71: "Hello world"
+ RenderBR {BR} at (71,475) size 0x0
+ RenderText {#text} at (0,480) size 71x19
+ text run at (0,480) width 71: "Hello world"
+ RenderBR {BR} at (71,495) size 0x0
+ RenderText {#text} at (0,500) size 71x19
+ text run at (0,500) width 71: "Hello world"
+ RenderBR {BR} at (71,515) size 0x0
+ RenderText {#text} at (0,520) size 71x19
+ text run at (0,520) width 71: "Hello world"
+ RenderBR {BR} at (71,535) size 0x0
+ RenderText {#text} at (0,540) size 71x19
+ text run at (0,540) width 71: "Hello world"
+ RenderBR {BR} at (71,555) size 0x0
+ RenderText {#text} at (0,560) size 71x19
+ text run at (0,560) width 71: "Hello world"
+ RenderBR {BR} at (71,575) size 0x0
+ RenderText {#text} at (0,580) size 71x19
+ text run at (0,580) width 71: "Hello world"
+ RenderBR {BR} at (71,595) size 0x0
+ RenderText {#text} at (0,600) size 71x19
+ text run at (0,600) width 71: "Hello world"
+ RenderBR {BR} at (71,615) size 0x0
+ RenderText {#text} at (0,620) size 71x19
+ text run at (0,620) width 71: "Hello world"
+ RenderBR {BR} at (71,635) size 0x0
+ RenderText {#text} at (0,640) size 71x19
+ text run at (0,640) width 71: "Hello world"
+ RenderBR {BR} at (71,655) size 0x0
+ RenderText {#text} at (0,660) size 71x19
+ text run at (0,660) width 71: "Hello world"
+ RenderBR {BR} at (71,675) size 0x0
+ RenderText {#text} at (0,680) size 71x19
+ text run at (0,680) width 71: "Hello world"
+ RenderBR {BR} at (71,695) size 0x0
+ RenderText {#text} at (0,700) size 71x19
+ text run at (0,700) width 71: "Hello world"
+ RenderBR {BR} at (71,715) size 0x0
+ RenderText {#text} at (0,720) size 71x19
+ text run at (0,720) width 71: "Hello world"
+ RenderBR {BR} at (71,735) size 0x0
+ RenderText {#text} at (0,740) size 71x19
+ text run at (0,740) width 71: "Hello world"
+ RenderBR {BR} at (71,755) size 0x0
+ RenderText {#text} at (0,760) size 71x19
+ text run at (0,760) width 71: "Hello world"
+ RenderBR {BR} at (71,775) size 0x0
+ RenderText {#text} at (0,780) size 71x19
+ text run at (0,780) width 71: "Hello world"
+ RenderBR {BR} at (71,795) size 0x0
+ RenderText {#text} at (0,800) size 71x19
+ text run at (0,800) width 71: "Hello world"
+ RenderBR {BR} at (71,815) size 0x0
+ RenderText {#text} at (0,820) size 71x19
+ text run at (0,820) width 71: "Hello world"
+ RenderBR {BR} at (71,835) size 0x0
+ RenderText {#text} at (0,840) size 71x19
+ text run at (0,840) width 71: "Hello world"
+ RenderBR {BR} at (71,855) size 0x0
+ RenderText {#text} at (0,860) size 71x19
+ text run at (0,860) width 71: "Hello world"
+ RenderBR {BR} at (71,875) size 0x0
+ RenderText {#text} at (0,880) size 71x19
+ text run at (0,880) width 71: "Hello world"
+ RenderBR {BR} at (71,895) size 0x0
+ RenderText {#text} at (0,900) size 71x19
+ text run at (0,900) width 71: "Hello world"
+ RenderBR {BR} at (71,915) size 0x0
+ RenderText {#text} at (0,920) size 71x19
+ text run at (0,920) width 71: "Hello world"
+ RenderBR {BR} at (71,935) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.checksum
new file mode 100644
index 0000000..f831280
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.checksum
@@ -0,0 +1 @@
+8537849c1190b1d7dbe3e63725d5bba7 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.png
new file mode 100644
index 0000000..2895817
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.txt
new file mode 100644
index 0000000..290a19b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-display-none-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {HTML} at (0,0) size 800x52
+ RenderBody {BODY} at (8,16) size 784x20
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 495x19
+ text run at (0,0) width 495: "Should not see the applet below (it has display:none). Java must be on for this test."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.checksum
new file mode 100644
index 0000000..7f54492
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.checksum
@@ -0,0 +1 @@
+fe01e6930044da0d433ad2f4ca9139b3 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.png
new file mode 100644
index 0000000..f9af236
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.txt
new file mode 100644
index 0000000..1d8efb1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/embed-display-none-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {HTML} at (0,0) size 800x52
+ RenderBody {BODY} at (8,16) size 784x20
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 324x19
+ text run at (0,0) width 324: "Should not see the embed below (it has display:none)."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.checksum
new file mode 100644
index 0000000..2f80e0f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.checksum
@@ -0,0 +1 @@
+0d8e73a8ac4dca017a86d9d94862ba74 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.png
new file mode 100644
index 0000000..8c81ab6
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.txt
new file mode 100644
index 0000000..18566f3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/object-display-none-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+ RenderBlock {HTML} at (0,0) size 800x52
+ RenderBody {BODY} at (8,16) size 784x20
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 321x19
+ text run at (0,0) width 321: "Should not see the object below (it has display:none)."
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index aa81487..c4f1300 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -60,7 +60,6 @@ DEFER LINUX WIN : LayoutTests/css2.1/t1202-counters-04-b.html = FAIL
// Bug 1124513: the max length is being applied correctly, but the over- and
// under-lines aren't placed properly over the "x".
-// Can defer this test once the crash is fixed.
DEFER : LayoutTests/fast/forms/input-text-maxlength.html = FAIL
DEFER : LayoutTests/fast/forms/input-text-paste-maxlength.html = FAIL
@@ -317,6 +316,14 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL
LINUX : chrome/fast/forms/basic-textareas.html = FAIL
LINUX : chrome/fast/forms/basic-textareas-quirks.html = FAIL
LINUX MAC : LayoutTests/editing/selection/5354455-1.html = FAIL
+LINUX : LayoutTests/editing/selection/select-missing-image.html = FAIL
+LINUX : LayoutTests/fast/events/offsetX-offsetY.html = FAIL
+LINUX : LayoutTests/fast/lists/list-marker-with-line-height.html = FAIL
+LINUX : LayoutTests/fast/overflow/overflow-stacking.html = FAIL
+LINUX : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
+LINUX : LayoutTests/fast/replaced/embed-display-none.html = FAIL
+LINUX : LayoutTests/fast/replaced/applet-display-none.html = FAIL
+LINUX : LayoutTests/fast/replaced/object-display-none.html = FAIL
LINUX : LayoutTests/fast/text/international/bidi-linebreak-001.html = FAIL
LINUX : LayoutTests/fast/text/international/bidi-linebreak-002.html = FAIL
LINUX : LayoutTests/fast/text/international/bidi-linebreak-003.html = FAIL
@@ -1791,20 +1798,11 @@ LayoutTests/svg/custom/pointer-events-path.svg = FAIL
WIN MAC : LayoutTests/svg/custom/pointer-events-text.svg = FAIL
// New tests from merge 41181:41217
-LINUX WIN : LayoutTests/fast/replaced/embed-display-none.html = FAIL
-LINUX WIN : LayoutTests/fast/replaced/applet-display-none.html = FAIL
-LINUX WIN : LayoutTests/fast/replaced/object-display-none.html = FAIL
-LINUX WIN : LayoutTests/fast/lists/list-marker-with-line-height.html = FAIL
-LINUX WIN : LayoutTests/fast/overflow/overflow-stacking.html = FAIL
-LINUX WIN : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
LayoutTests/fast/dom/getBoundingClientRect-getClientRects-relative-to-viewport.html = FAIL
// Regressions from merge 41181:41217
// New baseline upstream
-LINUX WIN : LayoutTests/fast/events/offsetX-offsetY.html = FAIL
LINUX WIN : LayoutTests/editing/selection/select-all-iframe.html = FAIL
-WIN : LayoutTests/editing/selection/select-from-textfield-outwards.html = FAIL
-LINUX WIN : LayoutTests/editing/selection/select-missing-image.html = FAIL
WIN : LayoutTests/fast/lists/drag-into-marker.html = FAIL
LINUX WIN : LayoutTests/fast/overflow/004.html = FAIL
LINUX WIN : LayoutTests/fast/overflow/hidden-scrollbar-resize.html = FAIL