Layout test rebaseline from removing scrollheight hack.

This does include some fail lines that I'm being too lazy to fix.
This test itself is in review upstream and the upstream results
won't have the fail lines.
Review URL: http://codereview.chromium.org/67014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13460 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 21 insertions, 21 deletions

diff --git a/DEPS b/DEPS
index 77ec823..f12bf9a 100644
--- a/DEPS
+++ b/DEPS
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@214",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@13377",
+    "/trunk/deps/third_party/WebKit@13459",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@13083",
diff --git a/webkit/data/layout_tests/chrome/fast/forms/textarea-metrics-expected.txt b/webkit/data/layout_tests/chrome/fast/forms/textarea-metrics-expected.txt
index 1d315bd..c83b4da 100644
--- a/webkit/data/layout_tests/chrome/fast/forms/textarea-metrics-expected.txt
+++ b/webkit/data/layout_tests/chrome/fast/forms/textarea-metrics-expected.txt
@@ -9,43 +9,43 @@ PASS document.getElementById('empty-textarea').clientHeight is 94
 PASS document.getElementById('empty-textarea').offsetWidth is 96
 PASS document.getElementById('empty-textarea').offsetHeight is 96
 PASS document.getElementById('empty-textarea').scrollWidth is 94
-PASS document.getElementById('empty-textarea').scrollHeight is 20
+FAIL document.getElementById('empty-textarea').scrollHeight should be 20. Was 94.
 PASS document.getElementById('empty-textarea-disabled').clientWidth is 94
 PASS document.getElementById('empty-textarea-disabled').clientHeight is 94
 PASS document.getElementById('empty-textarea-disabled').offsetWidth is 96
 PASS document.getElementById('empty-textarea-disabled').offsetHeight is 96
 PASS document.getElementById('empty-textarea-disabled').scrollWidth is 94
-PASS document.getElementById('empty-textarea-disabled').scrollHeight is 20
+FAIL document.getElementById('empty-textarea-disabled').scrollHeight should be 20. Was 94.
 PASS document.getElementById('textarea-no-scroll').clientWidth is 94
 PASS document.getElementById('textarea-no-scroll').clientHeight is 94
 PASS document.getElementById('textarea-no-scroll').offsetWidth is 96
 PASS document.getElementById('textarea-no-scroll').offsetHeight is 96
 PASS document.getElementById('textarea-no-scroll').scrollWidth is 94
-PASS document.getElementById('textarea-no-scroll').scrollHeight is 20
+FAIL document.getElementById('textarea-no-scroll').scrollHeight should be 20. Was 94.
 FAIL document.getElementById('textarea-with-scroll').clientWidth should be 77. Was 94.
 PASS document.getElementById('textarea-with-scroll').clientHeight is 94
 PASS document.getElementById('textarea-with-scroll').offsetWidth is 96
 PASS document.getElementById('textarea-with-scroll').offsetHeight is 96
 FAIL document.getElementById('textarea-with-scroll').scrollWidth should be 77. Was 94.
-FAIL document.getElementById('textarea-with-scroll').scrollHeight should be 132. Was 84.
+FAIL document.getElementById('textarea-with-scroll').scrollHeight should be 132. Was 94.
 PASS document.getElementById('textarea-no-scroll-with-padding').clientWidth is 106
 PASS document.getElementById('textarea-no-scroll-with-padding').clientHeight is 106
 PASS document.getElementById('textarea-no-scroll-with-padding').offsetWidth is 108
 PASS document.getElementById('textarea-no-scroll-with-padding').offsetHeight is 108
 PASS document.getElementById('textarea-no-scroll-with-padding').scrollWidth is 106
-PASS document.getElementById('textarea-no-scroll-with-padding').scrollHeight is 32
+FAIL document.getElementById('textarea-no-scroll-with-padding').scrollHeight should be 32. Was 106.
 FAIL document.getElementById('textarea-with-scroll-with-padding').clientWidth should be 89. Was 106.
 PASS document.getElementById('textarea-with-scroll-with-padding').clientHeight is 106
 PASS document.getElementById('textarea-with-scroll-with-padding').offsetWidth is 108
 PASS document.getElementById('textarea-with-scroll-with-padding').offsetHeight is 108
 FAIL document.getElementById('textarea-with-scroll-with-padding').scrollWidth should be 89. Was 106.
-FAIL document.getElementById('textarea-with-scroll-with-padding').scrollHeight should be 144. Was 96.
+FAIL document.getElementById('textarea-with-scroll-with-padding').scrollHeight should be 144. Was 106.
 PASS document.getElementById('textarea-no-scroll-fixed-height').clientWidth is 94
 PASS document.getElementById('textarea-no-scroll-fixed-height').clientHeight is 54
 PASS document.getElementById('textarea-no-scroll-fixed-height').offsetWidth is 96
 PASS document.getElementById('textarea-no-scroll-fixed-height').offsetHeight is 56
 PASS document.getElementById('textarea-no-scroll-fixed-height').scrollWidth is 94
-PASS document.getElementById('textarea-no-scroll-fixed-height').scrollHeight is 20
+FAIL document.getElementById('textarea-no-scroll-fixed-height').scrollHeight should be 20. Was 54.
 FAIL document.getElementById('textarea-with-scroll-fixed-height').clientWidth should be 77. Was 79.
 PASS document.getElementById('textarea-with-scroll-fixed-height').clientHeight is 54
 PASS document.getElementById('textarea-with-scroll-fixed-height').offsetWidth is 96
@@ -57,7 +57,7 @@ PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').client
 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').offsetWidth is 96
 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').offsetHeight is 56
 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollWidth is 94
-PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollHeight is 20
+FAIL document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollHeight should be 20. Was 54.
 FAIL document.getElementById('textarea-with-scroll-fixed-height-many-rows').clientWidth should be 77. Was 79.
 PASS document.getElementById('textarea-with-scroll-fixed-height-many-rows').clientHeight is 54
 PASS document.getElementById('textarea-with-scroll-fixed-height-many-rows').offsetWidth is 96
@@ -69,11 +69,11 @@ PASS document.getElementById('textarea-no-scroll-disabled').clientHeight is 94
 PASS document.getElementById('textarea-no-scroll-disabled').offsetWidth is 96
 PASS document.getElementById('textarea-no-scroll-disabled').offsetHeight is 96
 PASS document.getElementById('textarea-no-scroll-disabled').scrollWidth is 94
-PASS document.getElementById('textarea-no-scroll-disabled').scrollHeight is 20
+FAIL document.getElementById('textarea-no-scroll-disabled').scrollHeight should be 20. Was 94.
 FAIL document.getElementById('textarea-with-scroll-disabled').clientWidth should be 77. Was 94.
 PASS document.getElementById('textarea-with-scroll-disabled').clientHeight is 94
 PASS document.getElementById('textarea-with-scroll-disabled').offsetWidth is 96
 PASS document.getElementById('textarea-with-scroll-disabled').offsetHeight is 96
 FAIL document.getElementById('textarea-with-scroll-disabled').scrollWidth should be 77. Was 94.
-FAIL document.getElementById('textarea-with-scroll-disabled').scrollHeight should be 132. Was 84.
+FAIL document.getElementById('textarea-with-scroll-disabled').scrollHeight should be 132. Was 94.
 
diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/forms/textarea-metrics-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/forms/textarea-metrics-expected.txt
index 9026efb..d95f6a7 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/forms/textarea-metrics-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/forms/textarea-metrics-expected.txt
@@ -9,43 +9,43 @@ PASS document.getElementById('empty-textarea').clientHeight is 94
 PASS document.getElementById('empty-textarea').offsetWidth is 96

 PASS document.getElementById('empty-textarea').offsetHeight is 96

 PASS document.getElementById('empty-textarea').scrollWidth is 94

-PASS document.getElementById('empty-textarea').scrollHeight is 20

+FAIL document.getElementById('empty-textarea').scrollHeight should be 20. Was 94.

 PASS document.getElementById('empty-textarea-disabled').clientWidth is 94

 PASS document.getElementById('empty-textarea-disabled').clientHeight is 94

 PASS document.getElementById('empty-textarea-disabled').offsetWidth is 96

 PASS document.getElementById('empty-textarea-disabled').offsetHeight is 96

 PASS document.getElementById('empty-textarea-disabled').scrollWidth is 94

-PASS document.getElementById('empty-textarea-disabled').scrollHeight is 20

+FAIL document.getElementById('empty-textarea-disabled').scrollHeight should be 20. Was 94.

 PASS document.getElementById('textarea-no-scroll').clientWidth is 94

 PASS document.getElementById('textarea-no-scroll').clientHeight is 94

 PASS document.getElementById('textarea-no-scroll').offsetWidth is 96

 PASS document.getElementById('textarea-no-scroll').offsetHeight is 96

 PASS document.getElementById('textarea-no-scroll').scrollWidth is 94

-PASS document.getElementById('textarea-no-scroll').scrollHeight is 20

+FAIL document.getElementById('textarea-no-scroll').scrollHeight should be 20. Was 94.

 FAIL document.getElementById('textarea-with-scroll').clientWidth should be 77. Was 94.

 PASS document.getElementById('textarea-with-scroll').clientHeight is 94

 PASS document.getElementById('textarea-with-scroll').offsetWidth is 96

 PASS document.getElementById('textarea-with-scroll').offsetHeight is 96

 FAIL document.getElementById('textarea-with-scroll').scrollWidth should be 77. Was 94.

-FAIL document.getElementById('textarea-with-scroll').scrollHeight should be 132. Was 84.

+FAIL document.getElementById('textarea-with-scroll').scrollHeight should be 132. Was 94.

 PASS document.getElementById('textarea-no-scroll-with-padding').clientWidth is 106

 PASS document.getElementById('textarea-no-scroll-with-padding').clientHeight is 106

 PASS document.getElementById('textarea-no-scroll-with-padding').offsetWidth is 108

 PASS document.getElementById('textarea-no-scroll-with-padding').offsetHeight is 108

 PASS document.getElementById('textarea-no-scroll-with-padding').scrollWidth is 106

-PASS document.getElementById('textarea-no-scroll-with-padding').scrollHeight is 32

+FAIL document.getElementById('textarea-no-scroll-with-padding').scrollHeight should be 32. Was 106.

 FAIL document.getElementById('textarea-with-scroll-with-padding').clientWidth should be 89. Was 106.

 PASS document.getElementById('textarea-with-scroll-with-padding').clientHeight is 106

 PASS document.getElementById('textarea-with-scroll-with-padding').offsetWidth is 108

 PASS document.getElementById('textarea-with-scroll-with-padding').offsetHeight is 108

 FAIL document.getElementById('textarea-with-scroll-with-padding').scrollWidth should be 89. Was 106.

-FAIL document.getElementById('textarea-with-scroll-with-padding').scrollHeight should be 144. Was 96.

+FAIL document.getElementById('textarea-with-scroll-with-padding').scrollHeight should be 144. Was 106.

 PASS document.getElementById('textarea-no-scroll-fixed-height').clientWidth is 94

 PASS document.getElementById('textarea-no-scroll-fixed-height').clientHeight is 54

 PASS document.getElementById('textarea-no-scroll-fixed-height').offsetWidth is 96

 PASS document.getElementById('textarea-no-scroll-fixed-height').offsetHeight is 56

 PASS document.getElementById('textarea-no-scroll-fixed-height').scrollWidth is 94

-PASS document.getElementById('textarea-no-scroll-fixed-height').scrollHeight is 20

+FAIL document.getElementById('textarea-no-scroll-fixed-height').scrollHeight should be 20. Was 54.

 FAIL document.getElementById('textarea-with-scroll-fixed-height').clientWidth should be 77. Was 79.

 PASS document.getElementById('textarea-with-scroll-fixed-height').clientHeight is 54

 PASS document.getElementById('textarea-with-scroll-fixed-height').offsetWidth is 96

@@ -57,7 +57,7 @@ PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').client
 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').offsetWidth is 96

 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').offsetHeight is 56

 PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollWidth is 94

-PASS document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollHeight is 20

+FAIL document.getElementById('textarea-no-scroll-fixed-height-many-rows').scrollHeight should be 20. Was 54.

 FAIL document.getElementById('textarea-with-scroll-fixed-height-many-rows').clientWidth should be 77. Was 79.

 PASS document.getElementById('textarea-with-scroll-fixed-height-many-rows').clientHeight is 54

 PASS document.getElementById('textarea-with-scroll-fixed-height-many-rows').offsetWidth is 96

@@ -69,11 +69,11 @@ PASS document.getElementById('textarea-no-scroll-disabled').clientHeight is 94
 PASS document.getElementById('textarea-no-scroll-disabled').offsetWidth is 96

 PASS document.getElementById('textarea-no-scroll-disabled').offsetHeight is 96

 PASS document.getElementById('textarea-no-scroll-disabled').scrollWidth is 94

-PASS document.getElementById('textarea-no-scroll-disabled').scrollHeight is 20

+FAIL document.getElementById('textarea-no-scroll-disabled').scrollHeight should be 20. Was 94.

 FAIL document.getElementById('textarea-with-scroll-disabled').clientWidth should be 77. Was 94.

 PASS document.getElementById('textarea-with-scroll-disabled').clientHeight is 94

 PASS document.getElementById('textarea-with-scroll-disabled').offsetWidth is 96

 PASS document.getElementById('textarea-with-scroll-disabled').offsetHeight is 96

 FAIL document.getElementById('textarea-with-scroll-disabled').scrollWidth should be 77. Was 94.

-FAIL document.getElementById('textarea-with-scroll-disabled').scrollHeight should be 132. Was 84.

+FAIL document.getElementById('textarea-with-scroll-disabled').scrollHeight should be 132. Was 94.