diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 19:01:47 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 19:01:47 +0000 |
| commit | e382a69f617ee0c196f7fe4b2f61ba6decd29b29 (patch) | |
| tree | 1ac88a14ce14c3156b3a976408e3806320fe1dea | |
| parent | 425210cc4509d0339664eb142c3ae86500407bb1 (diff) | |
| download | chromium_src-e382a69f617ee0c196f7fe4b2f61ba6decd29b29.zip chromium_src-e382a69f617ee0c196f7fe4b2f61ba6decd29b29.tar.gz chromium_src-e382a69f617ee0c196f7fe4b2f61ba6decd29b29.tar.bz2 | |
Chrome side of merge 41733:41768.
Review URL: http://codereview.chromium.org/48083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11894 0039d316-1c4b-4281-b951-d872f2087c98
59 files changed, 481 insertions, 484 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41733", + "webkit_revision": "41768", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@167", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@11800", + "/trunk/deps/third_party/WebKit@11893", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11496", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index f7496bf..cc62aa6 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@41733
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@41768
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.txt index 3b18f26..a6596d9 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {HTML} at (0,0) size 800x178 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {P} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {P} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {HTML} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {P} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {P} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.txt index 24f6ef2..7ca60fe 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/002-xhtml-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.txt index 24f6ef2..7ca60fe 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-declarative-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.txt index 1b4c179..8a9d032 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {P} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {P} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {BODY} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {P} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {P} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt index 24f6ef2..7ca60fe 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/003-xhtml-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {body} at (8,8) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.checksum index 8fc3ae5..befaa06 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.checksum @@ -1 +1 @@ -873541d03ef12def9c92ac96e1c241de
\ No newline at end of file +20e92616cd17cee031b69017306268e1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.png Binary files differindex ddd43cd..f8010b5 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.txt index 03a14ee..2d51908 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-declarative-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x162 - RenderBlock {html} at (0,0) size 800x162 -layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 220 - RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x162
+ RenderBlock {html} at (0,0) size 800x162
+layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 236
+ RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.checksum index 8fc3ae5..befaa06 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.checksum @@ -1 +1 @@ -873541d03ef12def9c92ac96e1c241de
\ No newline at end of file +20e92616cd17cee031b69017306268e1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.png Binary files differindex ddd43cd..f8010b5 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.txt index cc3277a..e374a0d 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x162 - RenderBlock {HTML} at (0,0) size 800x162 -layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 220 - RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {P} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {P} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x162
+ RenderBlock {HTML} at (0,0) size 800x162
+layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 236
+ RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {P} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {P} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.checksum index 8fc3ae5..befaa06 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.checksum @@ -1 +1 @@ -873541d03ef12def9c92ac96e1c241de
\ No newline at end of file +20e92616cd17cee031b69017306268e1
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.png Binary files differindex ddd43cd..f8010b5 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.txt index 03a14ee..2d51908 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/004-xhtml-expected.txt @@ -1,23 +1,23 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x162 - RenderBlock {html} at (0,0) size 800x162 -layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 220 - RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x162
+ RenderBlock {html} at (0,0) size 800x162
+layer at (0,0) size 162x162 clip at (1,1) size 145x145 scrollHeight 236
+ RenderBlock {body} at (0,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.txt index 5b10ce6..7ea14ef 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-declarative-expected.txt @@ -1,28 +1,28 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 - RenderBlock (anonymous) at (0,0) size 800x0 - RenderInline {bogus} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,8) size 800x162 - RenderBlock (anonymous) at (0,178) size 800x0 - RenderInline {bogus} at (0,0) size 0x0 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+ RenderBlock (anonymous) at (0,0) size 800x0
+ RenderInline {bogus} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,8) size 800x162
+ RenderBlock (anonymous) at (0,178) size 800x0
+ RenderInline {bogus} at (0,0) size 0x0
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.txt index 4294da9..8ec2357 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-expected.txt @@ -1,28 +1,28 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {HTML} at (0,0) size 800x178 - RenderBlock (anonymous) at (0,0) size 800x0 - RenderInline {BOGUS} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,8) size 800x162 - RenderBlock (anonymous) at (0,178) size 800x0 - RenderInline {BOGUS} at (0,0) size 0x0 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {BODY} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {P} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {P} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {P} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {HTML} at (0,0) size 800x178
+ RenderBlock (anonymous) at (0,0) size 800x0
+ RenderInline {BOGUS} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,8) size 800x162
+ RenderBlock (anonymous) at (0,178) size 800x0
+ RenderInline {BOGUS} at (0,0) size 0x0
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {BODY} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {P} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {P} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {P} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.checksum index 13ac8a6..a101b20 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.checksum @@ -1 +1 @@ -775cfda1a4e0d27c433539dc4225661e
\ No newline at end of file +bd628d8caef86f9cea4cf5a6591962ef
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.png Binary files differindex 3ef6f68..9b48229 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.txt index 5b10ce6..7ea14ef 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/body-propagation/overflow/007-xhtml-expected.txt @@ -1,28 +1,28 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x178 - RenderBlock {html} at (0,0) size 800x178 - RenderBlock (anonymous) at (0,0) size 800x0 - RenderInline {bogus} at (0,0) size 0x0 - RenderBlock (anonymous) at (0,8) size 800x162 - RenderBlock (anonymous) at (0,178) size 800x0 - RenderInline {bogus} at (0,0) size 0x0 -layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 220 - RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)] - RenderBlock {p} at (1,17) size 145x60 - RenderText {#text} at (0,0) size 140x59 - text run at (0,0) width 97: "There should be" - text run at (0,20) width 140: "scrollbars for this box -" - text run at (0,40) width 133: "- not for the viewport." - RenderBlock {p} at (1,93) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,129) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,165) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." - RenderBlock {p} at (1,201) size 145x20 [color=#808080] - RenderText {#text} at (0,0) size 97x19 - text run at (0,0) width 97: "This is filler text." +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x178
+ RenderBlock {html} at (0,0) size 800x178
+ RenderBlock (anonymous) at (0,0) size 800x0
+ RenderInline {bogus} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,8) size 800x162
+ RenderBlock (anonymous) at (0,178) size 800x0
+ RenderInline {bogus} at (0,0) size 0x0
+layer at (8,8) size 162x162 clip at (9,9) size 145x145 scrollHeight 236
+ RenderBody {body} at (8,0) size 162x162 [color=#000080] [border: (1px solid #000080)]
+ RenderBlock {p} at (1,17) size 145x60
+ RenderText {#text} at (0,0) size 140x59
+ text run at (0,0) width 97: "There should be"
+ text run at (0,20) width 140: "scrollbars for this box -"
+ text run at (0,40) width 133: "- not for the viewport."
+ RenderBlock {p} at (1,93) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,129) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,165) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
+ RenderBlock {p} at (1,201) size 145x20 [color=#808080]
+ RenderText {#text} at (0,0) size 97x19
+ text run at (0,0) width 97: "This is filler text."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-disabled-color-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-disabled-color-expected.txt index c895ec9..802a31d 100755 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-disabled-color-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-disabled-color-expected.txt @@ -1,151 +1,151 @@ -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 485x19
- text run at (0,0) width 485: "This tests that the text color changes appropriately when the text field is disabled."
- RenderBR {BR} at (485,15) size 0x0
- RenderTextControl {INPUT} at (0,20) size 155x22 [bgcolor=#EBEBE4] [border: (2px inset #000000)]
- RenderText {#text} at (155,21) size 4x19
- text run at (155,21) width 4: " "
- RenderTextControl {INPUT} at (159,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (314,36) size 0x0
- RenderTextControl {INPUT} at (0,42) size 155x22 [color=#FF0000] [bgcolor=#EBEBE4] [border: (2px inset #FF0000)]
- RenderText {#text} at (155,43) size 4x19
- text run at (155,43) width 4: " "
- RenderTextControl {INPUT} at (159,42) size 155x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)]
- RenderBR {BR} at (314,58) size 0x0
- RenderTextControl {INPUT} at (0,64) size 155x22 [bgcolor=#0000FF] [border: (2px inset #000000)]
- RenderText {#text} at (155,65) size 4x19
- text run at (155,65) width 4: " "
- RenderTextControl {INPUT} at (159,64) size 155x22 [bgcolor=#0000FF] [border: (2px inset #000000)]
- RenderBR {BR} at (314,80) size 0x0
- RenderTextControl {INPUT} at (0,86) size 155x22 [color=#FF0000] [bgcolor=#0000FF] [border: (2px inset #FF0000)]
- RenderText {#text} at (155,87) size 4x19
- text run at (155,87) width 4: " "
- RenderTextControl {INPUT} at (159,86) size 155x22 [color=#FF0000] [bgcolor=#0000FF] [border: (2px inset #FF0000)]
- RenderBR {BR} at (314,102) size 0x0
- RenderTextControl {INPUT} at (0,108) size 155x22 [bgcolor=#000000] [border: (2px inset #000000)]
- RenderText {#text} at (155,109) size 4x19
- text run at (155,109) width 4: " "
- RenderTextControl {INPUT} at (159,108) size 155x22 [bgcolor=#000000] [border: (2px inset #000000)]
- RenderBR {BR} at (314,124) size 0x0
- RenderTextControl {INPUT} at (0,130) size 155x22 [color=#FFFFFF] [bgcolor=#000000] [border: (2px inset #FFFFFF)]
- RenderText {#text} at (155,131) size 4x19
- text run at (155,131) width 4: " "
- RenderTextControl {INPUT} at (159,130) size 155x22 [color=#FFFFFF] [bgcolor=#000000] [border: (2px inset #FFFFFF)]
- RenderBR {BR} at (314,146) size 0x0
- RenderTextControl {INPUT} at (0,152) size 155x22 [bgcolor=#808080] [border: (2px inset #000000)]
- RenderText {#text} at (155,153) size 4x19
- text run at (155,153) width 4: " "
- RenderTextControl {INPUT} at (159,152) size 155x22 [bgcolor=#808080] [border: (2px inset #000000)]
- RenderBR {BR} at (314,168) size 0x0
- RenderTextControl {INPUT} at (0,174) size 155x22 [color=#FFFFFF] [bgcolor=#A9A9A9] [border: (2px inset #FFFFFF)]
- RenderText {#text} at (155,175) size 4x19
- text run at (155,175) width 4: " "
- RenderTextControl {INPUT} at (159,174) size 155x22 [color=#FFFFFF] [bgcolor=#A9A9A9] [border: (2px inset #FFFFFF)]
- RenderBR {BR} at (314,190) size 0x0
- RenderTextControl {INPUT} at (0,196) size 155x22 [color=#808080] [bgcolor=#000000] [border: (2px inset #808080)]
- RenderText {#text} at (155,197) size 4x19
- text run at (155,197) width 4: " "
- RenderTextControl {INPUT} at (159,196) size 155x22 [color=#808080] [bgcolor=#000000] [border: (2px inset #808080)]
- RenderBR {BR} at (314,212) size 0x0
- RenderTextControl {INPUT} at (0,218) size 155x22 [color=#FF0000] [bgcolor=#808080] [border: (2px inset #FF0000)]
- RenderText {#text} at (155,219) size 4x19
- text run at (155,219) width 4: " "
- RenderTextControl {INPUT} at (159,218) size 155x22 [color=#FF0000] [bgcolor=#808080] [border: (2px inset #FF0000)]
- RenderBR {BR} at (314,234) size 0x0
- RenderTextControl {INPUT} at (0,240) size 155x22 [color=#808080] [bgcolor=#FF0000] [border: (2px inset #808080)]
- RenderText {#text} at (155,241) size 4x19
- text run at (155,241) width 4: " "
- RenderTextControl {INPUT} at (159,240) size 155x22 [color=#808080] [bgcolor=#FF0000] [border: (2px inset #808080)]
- RenderBR {BR} at (314,256) size 0x0
-layer at (10,31) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#545454]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,31) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,53) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,53) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,75) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#545454]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,75) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,97) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#AB0000]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,97) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,119) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#545454]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,119) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,141) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#ABABAB]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,141) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,163) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#545454]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,163) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,185) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,185) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,207) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#2C2C2C]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,207) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,229) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,229) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
-layer at (10,251) size 151x16 scrollWidth 379
- RenderBlock {DIV} at (2,3) size 151x16 [color=#2C2C2C]
- RenderText {#text} at (1,0) size 378x16
- text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey"
-layer at (169,251) size 151x16 scrollWidth 167
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 165x16
- text run at (1,0) width 165: "This text field is not disabled"
+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 485x19 + text run at (0,0) width 485: "This tests that the text color changes appropriately when the text field is disabled." + RenderBR {BR} at (485,15) size 0x0 + RenderTextControl {INPUT} at (0,20) size 155x22 [bgcolor=#EBEBE4] [border: (2px inset #000000)] + RenderText {#text} at (155,21) size 4x19 + text run at (155,21) width 4: " " + RenderTextControl {INPUT} at (159,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBR {BR} at (314,36) size 0x0 + RenderTextControl {INPUT} at (0,42) size 155x22 [color=#FF0000] [bgcolor=#EBEBE4] [border: (2px inset #FF0000)] + RenderText {#text} at (155,43) size 4x19 + text run at (155,43) width 4: " " + RenderTextControl {INPUT} at (159,42) size 155x22 [color=#FF0000] [bgcolor=#FFFFFF] [border: (2px inset #FF0000)] + RenderBR {BR} at (314,58) size 0x0 + RenderTextControl {INPUT} at (0,64) size 155x22 [bgcolor=#0000FF] [border: (2px inset #000000)] + RenderText {#text} at (155,65) size 4x19 + text run at (155,65) width 4: " " + RenderTextControl {INPUT} at (159,64) size 155x22 [bgcolor=#0000FF] [border: (2px inset #000000)] + RenderBR {BR} at (314,80) size 0x0 + RenderTextControl {INPUT} at (0,86) size 155x22 [color=#FF0000] [bgcolor=#0000FF] [border: (2px inset #FF0000)] + RenderText {#text} at (155,87) size 4x19 + text run at (155,87) width 4: " " + RenderTextControl {INPUT} at (159,86) size 155x22 [color=#FF0000] [bgcolor=#0000FF] [border: (2px inset #FF0000)] + RenderBR {BR} at (314,102) size 0x0 + RenderTextControl {INPUT} at (0,108) size 155x22 [bgcolor=#000000] [border: (2px inset #000000)] + RenderText {#text} at (155,109) size 4x19 + text run at (155,109) width 4: " " + RenderTextControl {INPUT} at (159,108) size 155x22 [bgcolor=#000000] [border: (2px inset #000000)] + RenderBR {BR} at (314,124) size 0x0 + RenderTextControl {INPUT} at (0,130) size 155x22 [color=#FFFFFF] [bgcolor=#000000] [border: (2px inset #FFFFFF)] + RenderText {#text} at (155,131) size 4x19 + text run at (155,131) width 4: " " + RenderTextControl {INPUT} at (159,130) size 155x22 [color=#FFFFFF] [bgcolor=#000000] [border: (2px inset #FFFFFF)] + RenderBR {BR} at (314,146) size 0x0 + RenderTextControl {INPUT} at (0,152) size 155x22 [bgcolor=#808080] [border: (2px inset #000000)] + RenderText {#text} at (155,153) size 4x19 + text run at (155,153) width 4: " " + RenderTextControl {INPUT} at (159,152) size 155x22 [bgcolor=#808080] [border: (2px inset #000000)] + RenderBR {BR} at (314,168) size 0x0 + RenderTextControl {INPUT} at (0,174) size 155x22 [color=#FFFFFF] [bgcolor=#A9A9A9] [border: (2px inset #FFFFFF)] + RenderText {#text} at (155,175) size 4x19 + text run at (155,175) width 4: " " + RenderTextControl {INPUT} at (159,174) size 155x22 [color=#FFFFFF] [bgcolor=#A9A9A9] [border: (2px inset #FFFFFF)] + RenderBR {BR} at (314,190) size 0x0 + RenderTextControl {INPUT} at (0,196) size 155x22 [color=#808080] [bgcolor=#000000] [border: (2px inset #808080)] + RenderText {#text} at (155,197) size 4x19 + text run at (155,197) width 4: " " + RenderTextControl {INPUT} at (159,196) size 155x22 [color=#808080] [bgcolor=#000000] [border: (2px inset #808080)] + RenderBR {BR} at (314,212) size 0x0 + RenderTextControl {INPUT} at (0,218) size 155x22 [color=#FF0000] [bgcolor=#808080] [border: (2px inset #FF0000)] + RenderText {#text} at (155,219) size 4x19 + text run at (155,219) width 4: " " + RenderTextControl {INPUT} at (159,218) size 155x22 [color=#FF0000] [bgcolor=#808080] [border: (2px inset #FF0000)] + RenderBR {BR} at (314,234) size 0x0 + RenderTextControl {INPUT} at (0,240) size 155x22 [color=#808080] [bgcolor=#FF0000] [border: (2px inset #808080)] + RenderText {#text} at (155,241) size 4x19 + text run at (155,241) width 4: " " + RenderTextControl {INPUT} at (159,240) size 155x22 [color=#808080] [bgcolor=#FF0000] [border: (2px inset #808080)] + RenderBR {BR} at (314,256) size 0x0 +layer at (10,31) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#545454] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,31) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,53) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,53) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,75) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#545454] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,75) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,97) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#AB0000] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,97) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,119) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#545454] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,119) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,141) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#ABABAB] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,141) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,163) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#545454] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,163) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,185) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,185) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,207) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#2C2C2C] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,207) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,229) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,229) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" +layer at (10,251) size 151x16 scrollWidth 380 + RenderBlock {DIV} at (2,3) size 151x16 [color=#2C2C2C] + RenderText {#text} at (1,0) size 378x16 + text run at (1,0) width 378: "The text in this disabled field should displayed as dimmed or grey" +layer at (169,251) size 151x16 scrollWidth 167 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 165x16 + text run at (1,0) width 165: "This text field is not disabled" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.checksum index 352897a..dcccc59 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.checksum @@ -1 +1 @@ -d769be8027ea219bcc627f8de3b0341d
\ No newline at end of file +24ebf38438f76ae477d1fa6f54a63704
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.png Binary files differindex 1ad70c8..925748f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.txt index 1fde8be..b9ae3c2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-autoscroll-expected.txt @@ -19,9 +19,9 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,94) size 784x20 RenderText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "ScrollLeft: 14" + text run at (0,0) width 82: "ScrollLeft: 15" RenderBR {BR} at (82,15) size 0x0 -layer at (10,83) size 151x16 scrollX 14 scrollWidth 165 +layer at (10,83) size 151x16 scrollX 15 scrollWidth 166 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 164x16 text run at (1,0) width 164: "abcdefghijklmnopqrstuvwxyz" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-dimmed-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-dimmed-expected.txt index a778b64..7299483 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-dimmed-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/input-readonly-dimmed-expected.txt @@ -9,7 +9,7 @@ layer at (0,0) size 800x600 RenderTextControl {INPUT} at (0,20) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 -layer at (10,31) size 151x16 scrollWidth 175 +layer at (10,31) size 151x16 scrollWidth 176 RenderBlock {DIV} at (2,3) size 151x16 RenderText {#text} at (1,0) size 174x16 text run at (1,0) width 174: "This border should be dimmed" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textAreaLineHeight-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textAreaLineHeight-expected.txt index 5295e73..37efc4b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textAreaLineHeight-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/textAreaLineHeight-expected.txt @@ -59,7 +59,7 @@ layer at (8,65) size 406x206 clip at (9,66) size 404x204 text run at (0,18) width 385: "Demo text here that wraps a bit and should demonstrate" text run at (385,18) width 0: " " text run at (0,70) width 181: "the goodness of line-height" -layer at (8,851) size 181x38 clip at (9,852) size 164x36 scrollHeight 82 +layer at (8,851) size 181x38 clip at (9,852) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (0,61) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.checksum index da5e32b..22ac7db 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.checksum @@ -1 +1 @@ -9d926465883e28b0190ba85c139ab441
\ No newline at end of file +455ccb12215543dba34c5ead945ae484
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.png Binary files differindex cfb00e6..72b5a20 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.txt index 5b1e1ee..c753dfd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/003-expected.txt @@ -2,7 +2,7 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 layer at (10,10) size 780x302 RenderBlock {fake} at (10,10) size 780x302 [bgcolor=#FFFF00] -layer at (10,10) size 282x302 clip at (11,11) size 265x300 scrollHeight 1264 +layer at (10,10) size 282x302 clip at (11,11) size 265x300 scrollHeight 1274 RenderBlock {channel} at (0,0) size 282x302 [bgcolor=#EEEEEE] [border: (1px solid #000000)] RenderBlock {title} at (11,11) size 255x18 RenderText {#text} at (0,0) size 153x18 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.checksum index 3b32821..ec147a1 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.checksum @@ -1 +1 @@ -aaae9ba4c1446f4b56e006f6c3327099
\ No newline at end of file +01fb9b150538663131c30c9627e7a3c5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.png Binary files differindex ef5edee..dfaf9a3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.txt index 41cc61e..5359247 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/007-expected.txt @@ -3,7 +3,7 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x388 RenderBlock {HTML} at (0,0) size 800x388 RenderBody {BODY} at (32,32) size 736x324 [bgcolor=#CCCCCC] -layer at (143,32) size 514x146 clip at (144,33) size 497x144 scrollHeight 304 +layer at (143,32) size 514x146 clip at (144,33) size 497x144 scrollHeight 332 RenderBlock {DIV} at (111,0) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)] RenderBlock {P} at (17,17) size 465x80 RenderText {#text} at (0,0) size 210x19 @@ -48,7 +48,7 @@ layer at (0,0) size 38x36 RenderBlock (positioned) {P} at (0,0) size 38x36 [bgcolor=#FF0000] RenderText {#text} at (8,8) size 22x19 text run at (8,8) width 22: "hi 1" -layer at (143,210) size 514x146 clip at (144,211) size 497x144 scrollHeight 340 +layer at (143,210) size 514x146 clip at (144,211) size 497x144 scrollHeight 368 RenderBlock (relative positioned) {DIV} at (111,178) size 514x146 [bgcolor=#FFFFFF] [border: (1px solid #999999)] RenderBlock {P} at (17,17) size 465x40 RenderText {#text} at (0,0) size 465x39 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.txt index 54b1a95..9a9af7e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/overflow/clip-rects-fixed-ancestor-expected.txt @@ -202,7 +202,7 @@ layer at (727,443) size 118x74 backgroundClip at (727,443) size 58x74 clip at (7 RenderBlock (anonymous) at (6,6) size 106x20 RenderText {#text} at (0,0) size 101x19 text run at (0,0) width 101: ".overflowHidden" -layer at (738,474) size 96x32 backgroundClip at (738,474) size 47x32 clip at (739,475) size 46x30 outlineClip at (728,444) size 57x72 scrollWidth 106 +layer at (738,474) size 96x32 backgroundClip at (738,474) size 47x32 clip at (739,475) size 46x30 outlineClip at (728,444) size 57x72 scrollWidth 111 RenderBlock {DIV} at (11,31) size 96x32 [border: (1px solid #999999)] RenderText {#text} at (6,6) size 101x19 text run at (6,6) width 101: ".overflowHidden" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.checksum index f302f2f..f2531bd 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.checksum @@ -1 +1 @@ -0da83ac2072a6f85558b2235e86ac863
\ No newline at end of file +b2521ce7cc1df57be378686cb171268d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.png Binary files differindex d17ccfa..f1dd6ab 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.txt index 6b27400..e6e0862 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/selection-gap-overflow-scroll-expected.txt @@ -16,7 +16,7 @@ layer at (0,0) size 800x600 text run at (0,20) width 85: "editing pages" RenderText {#text} at (85,20) size 4x19 text run at (85,20) width 4: "." -layer at (13,64) size 126x126 clip at (16,67) size 105x120 scrollY 30 scrollHeight 150 +layer at (13,64) size 126x126 clip at (16,67) size 105x120 scrollY 40 scrollHeight 160 RenderBlock {DIV} at (5,56) size 126x126 [border: (3px solid #000000)] RenderBlock {DIV} at (13,13) size 85x100 RenderBlock (anonymous) at (13,113) size 85x40 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt index 4be2c8b..e2ef12a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/scrollbars/overflow-scrollbar-combinations-expected.txt @@ -29,7 +29,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (334,420) size 4x19 text run at (334,420) width 4: " " RenderText {#text} at (0,0) size 0x0 -layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2040 +layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2050 RenderBlock {DIV} at (20,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" @@ -181,7 +181,7 @@ layer at (28,28) size 125x100 clip at (29,29) size 110x85 scrollHeight 2040 text run at (11,1999) width 59: "imperdiet" text run at (11,2013) width 52: "lacus eu" text run at (11,2027) width 38: "tellus." -layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 2040 +layer at (197,28) size 125x100 clip at (198,29) size 110x98 scrollHeight 2050 RenderBlock {DIV} at (189,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" @@ -371,7 +371,7 @@ layer at (366,28) size 125x100 clip at (367,29) size 110x85 scrollWidth 420 scro text run at (10,388) width 395: "Curabitur arcu pede, adipiscing sed, egestas nec, commodo in," text run at (10,402) width 396: "elit. Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi" text run at (10,416) width 267: "nec augue. Proin imperdiet lacus eu tellus." -layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2040 +layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2050 RenderBlock {DIV} at (527,20) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" @@ -523,7 +523,7 @@ layer at (535,28) size 125x100 clip at (536,29) size 110x85 scrollHeight 2040 text run at (11,1999) width 59: "imperdiet" text run at (11,2013) width 52: "lacus eu" text run at (11,2027) width 38: "tellus." -layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 2040 +layer at (28,168) size 125x100 clip at (29,169) size 110x98 scrollHeight 2050 RenderBlock {DIV} at (20,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" @@ -713,7 +713,7 @@ layer at (197,168) size 125x100 clip at (198,169) size 110x85 scrollWidth 420 sc text run at (10,388) width 395: "Curabitur arcu pede, adipiscing sed, egestas nec, commodo in," text run at (10,402) width 396: "elit. Nulla facilisi. Proin varius pede et dui lacinia dapibus. Morbi" text run at (10,416) width 267: "nec augue. Proin imperdiet lacus eu tellus." -layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 2040 +layer at (366,168) size 125x100 clip at (367,169) size 110x98 scrollHeight 2050 RenderBlock {DIV} at (358,160) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" @@ -880,7 +880,7 @@ layer at (535,168) size 125x100 clip at (536,169) size 123x85 scrollWidth 420 sc text run at (10,122) width 398: "volutpat rhoncus, condimentum ut, tortor. Integer est. Quisque" text run at (10,136) width 377: "viverra. Praesent sed arcu. Maecenas id lorem a leo lobortis" text run at (10,150) width 88: "condimentum." -layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 2040 +layer at (28,308) size 125x100 clip at (29,309) size 110x98 scrollHeight 2050 RenderBlock {DIV} at (20,300) size 125x100 [color=#DCDCDC] [bgcolor=#718D93] [border: (1px solid #D3D3D3)] RenderText {#text} at (11,11) size 89x770 text run at (11,11) width 80: "Lorem ipsum" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug83786-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug83786-expected.txt index 3ce5594..2a58202 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug83786-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug83786-expected.txt @@ -3,7 +3,7 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (0,0) size 800x136 -layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollHeight 144 +layer at (0,0) size 266x136 clip at (3,3) size 260x130 scrollWidth 324 scrollHeight 144 RenderBlock {DIV} at (0,0) size 266x136 [border: (3px solid #008000)] RenderTable {TABLE} at (16,3) size 64x143 RenderTableSection {TBODY} at (0,0) size 64x143 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug106966-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug106966-expected.txt index 8ca2383..74d7315 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug106966-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug106966-expected.txt @@ -176,7 +176,7 @@ layer at (33,1368) size 150x52 RenderTableCell {TD} at (15,15) size 52x22 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 28x19 text run at (1,1) width 28: "cell1" -layer at (115,1383) size 53x22 scrollWidth 124 +layer at (115,1383) size 53x22 scrollWidth 125 RenderTableCell {TD} at (82,15) size 53x22 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 123x19 text run at (1,1) width 123: "contentwithoutspace" diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.checksum index a8efc85..f6bd717 100644 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.checksum @@ -1 +1 @@ -c9c530abb22cb6b2512a2fcb3cec497b
\ No newline at end of file +1e4d6629e88631c90eedd8fed5a04202
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.png b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.png Binary files differindex 04d7c54..e434832 100644 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.txt b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.txt index f56cb79..b43c0aa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-expected.txt @@ -229,7 +229,7 @@ layer at (23,25) size 181x38 clip at (24,26) size 179x36 RenderBlock {DIV} at (3,3) size 160x16 RenderText {#text} at (0,0) size 136x16 text run at (0,0) width 136: "Lorem ipsum dolor" -layer at (23,83) size 181x38 clip at (24,84) size 164x36 scrollHeight 82 +layer at (23,83) size 181x38 clip at (24,84) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -241,7 +241,7 @@ layer at (23,83) size 181x38 clip at (24,84) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,141) size 181x38 clip at (24,142) size 164x36 scrollHeight 82 +layer at (23,141) size 181x38 clip at (24,142) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 181x38 [bgcolor=#EBEBE4] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 [color=#545454] RenderText {#text} at (0,0) size 160x80 @@ -253,7 +253,7 @@ layer at (23,141) size 181x38 clip at (24,142) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,199) size 197x54 clip at (24,200) size 180x52 scrollHeight 90 +layer at (23,199) size 197x54 clip at (24,200) size 180x52 scrollHeight 100 RenderTextControl {TEXTAREA} at (14,2) size 197x54 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (11,11) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -277,7 +277,7 @@ layer at (23,273) size 177x34 clip at (24,274) size 160x32 scrollHeight 80 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (33,336) size 181x38 clip at (34,337) size 164x36 scrollHeight 82 +layer at (33,336) size 181x38 clip at (34,337) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (24,11) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -289,7 +289,7 @@ layer at (33,336) size 181x38 clip at (34,337) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,402) size 181x38 clip at (24,403) size 164x36 scrollHeight 82 +layer at (23,402) size 181x38 clip at (24,403) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,1) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -301,7 +301,7 @@ layer at (23,402) size 181x38 clip at (24,403) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,459) size 45x38 clip at (24,460) size 28x36 scrollHeight 370 +layer at (23,459) size 45x38 clip at (24,460) size 28x36 scrollHeight 372 RenderTextControl {TEXTAREA} at (14,2) size 45x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 24x368 RenderText {#text} at (0,0) size 24x368 @@ -333,7 +333,7 @@ layer at (23,459) size 45x38 clip at (24,460) size 28x36 scrollHeight 370 text run at (0,336) width 24: "stu" text run at (0,352) width 8: "v" text run at (8,352) width 8: " " -layer at (23,517) size 181x54 clip at (24,518) size 164x52 scrollHeight 82 +layer at (23,517) size 181x54 clip at (24,518) size 164x52 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 181x54 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -345,7 +345,7 @@ layer at (23,517) size 181x54 clip at (24,518) size 164x52 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,591) size 101x38 clip at (24,592) size 84x36 scrollHeight 146 +layer at (23,591) size 101x38 clip at (24,592) size 84x36 scrollHeight 148 RenderTextControl {TEXTAREA} at (14,2) size 101x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 80x144 RenderText {#text} at (0,0) size 80x144 @@ -375,7 +375,7 @@ layer at (23,649) size 181x166 clip at (24,650) size 179x164 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (23,835) size 61x70 clip at (24,836) size 44x68 scrollHeight 226 +layer at (23,835) size 61x70 clip at (24,836) size 44x68 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 61x70 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 40x224 RenderText {#text} at (0,0) size 40x224 @@ -398,7 +398,7 @@ layer at (23,835) size 61x70 clip at (24,836) size 44x68 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,25) size 66x38 clip at (376,26) size 49x36 scrollHeight 226 +layer at (375,25) size 66x38 clip at (376,26) size 49x36 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -421,7 +421,7 @@ layer at (375,25) size 66x38 clip at (376,26) size 49x36 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,83) size 102x74 clip at (376,84) size 85x72 scrollHeight 244 +layer at (375,83) size 102x74 clip at (376,84) size 85x72 scrollHeight 264 RenderTextControl {TEXTAREA} at (14,2) size 102x74 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (21,21) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -467,7 +467,7 @@ layer at (375,177) size 62x34 clip at (376,178) size 45x32 scrollHeight 224 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,231) size 181x66 clip at (376,232) size 164x64 scrollHeight 82 +layer at (375,231) size 181x66 clip at (376,232) size 164x64 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 181x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -479,7 +479,7 @@ layer at (375,231) size 181x66 clip at (376,232) size 164x64 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (375,317) size 66x66 clip at (376,318) size 49x64 scrollHeight 226 +layer at (375,317) size 66x66 clip at (376,318) size 49x64 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -502,7 +502,7 @@ layer at (375,317) size 66x66 clip at (376,318) size 49x64 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,403) size 166x38 clip at (376,404) size 164x36 scrollHeight 82 +layer at (375,403) size 166x38 clip at (376,404) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 166x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -514,7 +514,7 @@ layer at (375,403) size 166x38 clip at (376,404) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (375,461) size 181x53 clip at (376,462) size 164x36 scrollHeight 82 +layer at (375,461) size 181x53 clip at (376,462) size 164x36 scrollHeight 84 RenderTextControl {TEXTAREA} at (14,2) size 181x53 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x80 RenderText {#text} at (0,0) size 160x80 @@ -526,7 +526,7 @@ layer at (375,461) size 181x53 clip at (376,462) size 164x36 scrollHeight 82 text run at (0,48) width 160: "abcdefghijklmnopqrst" text run at (0,64) width 16: "uv" text run at (16,64) width 8: " " -layer at (375,534) size 66x66 clip at (376,535) size 64x64 scrollHeight 178 +layer at (375,534) size 66x66 clip at (376,535) size 64x64 scrollHeight 180 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 60x176 RenderText {#text} at (0,0) size 56x176 @@ -546,7 +546,7 @@ layer at (375,534) size 66x66 clip at (376,535) size 64x64 scrollHeight 178 text run at (0,144) width 56: "opqrstu" text run at (0,160) width 8: "v" text run at (8,160) width 8: " " -layer at (375,620) size 66x66 clip at (376,621) size 49x49 scrollHeight 226 +layer at (375,620) size 66x66 clip at (376,621) size 49x49 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -569,7 +569,7 @@ layer at (375,620) size 66x66 clip at (376,621) size 49x49 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,706) size 66x66 clip at (376,707) size 49x64 scrollHeight 226 +layer at (375,706) size 66x66 clip at (376,707) size 49x64 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -592,7 +592,7 @@ layer at (375,706) size 66x66 clip at (376,707) size 49x64 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,792) size 66x66 clip at (376,793) size 49x64 scrollHeight 226 +layer at (375,792) size 66x66 clip at (376,793) size 49x64 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -615,7 +615,7 @@ layer at (375,792) size 66x66 clip at (376,793) size 49x64 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,878) size 66x66 clip at (376,879) size 49x64 scrollHeight 226 +layer at (375,878) size 66x66 clip at (376,879) size 49x64 scrollHeight 228 RenderTextControl {TEXTAREA} at (14,2) size 66x66 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 45x224 RenderText {#text} at (0,0) size 45x224 @@ -638,7 +638,7 @@ layer at (375,878) size 66x66 clip at (376,879) size 49x64 scrollHeight 226 text run at (0,192) width 40: "pqrst" text run at (0,208) width 16: "uv" text run at (16,208) width 8: " " -layer at (375,964) size 181x53 clip at (376,965) size 164x36 scrollWidth 290 scrollHeight 258 +layer at (375,964) size 181x53 clip at (376,965) size 164x36 scrollWidth 290 scrollHeight 260 RenderTextControl {TEXTAREA} at (14,2) size 181x53 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x256 RenderText {#text} at (0,0) size 288x240 @@ -673,7 +673,7 @@ layer at (375,964) size 181x53 clip at (376,965) size 164x36 scrollWidth 290 scr text run at (0,224) width 288: "This is a text area with wrap=\"soft\"" text run at (288,224) width 0: " " RenderBR {BR} at (0,240) size 0x16 -layer at (375,1037) size 181x38 clip at (376,1038) size 164x36 scrollHeight 482 +layer at (375,1037) size 181x38 clip at (376,1038) size 164x36 scrollHeight 484 RenderTextControl {TEXTAREA} at (14,2) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x480 RenderText {#text} at (0,0) size 160x464 @@ -736,7 +736,7 @@ layer at (375,1037) size 181x38 clip at (376,1038) size 164x36 scrollHeight 482 text run at (0,448) width 128: "with wrap=\"soft\"" text run at (128,448) width 0: " " RenderBR {BR} at (0,464) size 0x16 -layer at (375,1095) size 181x38 clip at (376,1096) size 164x36 scrollHeight 482 +layer at (375,1095) size 181x38 clip at (376,1096) size 164x36 scrollHeight 484 RenderTextControl {TEXTAREA} at (14,2) size 181x38 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 160x480 RenderText {#text} at (0,0) size 160x464 diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-quirks-expected.txt b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-quirks-expected.txt index d92dd62..5726d74 100644 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-quirks-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/forms/basic-textareas-quirks-expected.txt @@ -253,7 +253,7 @@ layer at (23,137) size 179x36 clip at (24,138) size 162x34 scrollHeight 82 text run at (0,48) width 152: "abcdefghijklmnopqrs" text run at (0,64) width 24: "tuv" text run at (24,64) width 8: " " -layer at (23,193) size 197x54 clip at (24,194) size 180x52 scrollHeight 90 +layer at (23,193) size 197x54 clip at (24,194) size 180x52 scrollHeight 100 RenderTextControl {TEXTAREA} at (14,2) size 197x54 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (11,11) size 158x80 RenderText {#text} at (0,0) size 152x80 @@ -440,7 +440,7 @@ layer at (375,25) size 60x36 clip at (376,26) size 43x34 scrollHeight 306 text run at (0,272) width 32: "qrst" text run at (0,288) width 16: "uv" text run at (16,288) width 8: " " -layer at (375,81) size 60x74 clip at (376,82) size 43x72 scrollHeight 1028 +layer at (375,81) size 60x74 clip at (376,82) size 43x72 scrollHeight 1048 RenderTextControl {TEXTAREA} at (14,2) size 60x74 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (21,21) size 1x1008 RenderText {#text} at (0,0) size 8x1008 diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index ea6e10d..78fd912 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1338,7 +1338,7 @@ DEFER SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-load // Linux pixeltest failure: alpha=0.5 red (1,0,0) atop yellow (1,1,0) is // coming out with with a slightly-less-than-100% red channel. This test fails // because we enforce non-transparent color in Font::drawGlyphs. See <b/700464>. -LINUX WIN : LayoutTests/fast/css/hsla-color.html = FAIL +LINUX : LayoutTests/fast/css/hsla-color.html = FAIL // Linux pixeltest failure: flaky? Appears without red locally. LINUX : LayoutTests/fast/layers/layer-visibility-sublayer.html = PASS FAIL @@ -1826,9 +1826,6 @@ DEFER MAC LINUX : LayoutTests/fast/forms/placeholder-set-value.html = FAIL // instead of themeWin.css and then this test should pass. LINUX : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL -// Started failing with r11635 (mbelshe) -WIN : LayoutTests/fast/dom/undetectable-document-all.html = FAIL - // New failures from 41660:41709 // Newly added tests. DEFER LINUX WIN : LayoutTests/editing/pasteboard/5089327.html = FAIL |
