Do not use setInnerText in INPUT / TEXTAREA.
Use replaceChildrenWithText instead.
This means we don't produce <br> in shadow editing elements of TEXTAREA on setting
value. This change is basically not user-visible except TEXTAREAs with
unusual white-space values. Such TEXTAREAs are already broken and we'll fix them
soon.
BUG=268807, 593184
[email protected]
Review URL: https://codereview.chromium.org/1776903003 .
Cr-Commit-Position: refs/heads/master@{#380313}
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 7b5ee5a..46365a0 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -531,6 +531,16 @@
crbug.com/325673 imported/web-platform-tests/custom-elements/concepts/custom-elements-type-naming.html [ Failure ]
crbug.com/542660 fast/css/absolute-inline-alignment-2.html [ Failure ]
+crbug.com/593184 editing/input/reveal-caret-of-multiline-input.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/basic-textareas-quirks.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-scroll-height.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-scrollbar.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-scrolled-focus-ring.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-scrolled-mask.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-scrolled-type.html [ NeedsRebaseline ]
+crbug.com/593184 fast/forms/textarea/textarea-width.html [ NeedsRebaseline ]
+crbug.com/593184 fast/parser/open-comment-in-textarea.html [ NeedsRebaseline ]
+crbug.com/593184 fast/text/international/unicode-bidi-plaintext-in-textarea.html [ NeedsRebaseline ]
# Ref tests that needs investigation.
crbug.com/404597 [ Mac ] fast/css3-text/css3-text-justify/text-justify-crash.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-preline-eol-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-preline-eol-expected.txt
index dac87d7..2c3c90c 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-preline-eol-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/textarea/textarea-preline-eol-expected.txt
@@ -1,4 +1,4 @@
This is a testharness.js-based test.
-FAIL TEXTAREA with white-space:pre-line should not produce nbsp by Enter key assert_equals: expected "P1\n\nP2\n\n\n\nP3\n" but got "P1\n\nP2\n\n \nP3\n"
+FAIL TEXTAREA with white-space:pre-line should not produce nbsp by Enter key assert_equals: expected "P1\n\nP2\n\n\n\nP3\n" but got "P1\n\nP2\n\n P3\n"
Harness: the test ran to completion.
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.txt
index 75b2ec0..8d0af1a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.txt
@@ -12,98 +12,68 @@
layer at (8,26) size 81x136 clip at (9,27) size 64x134 scrollY 98.00 scrollHeight 420
LayoutTextControl {TEXTAREA} at (0,0) size 81x136 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 60x416
- LayoutText {#text} at (0,0) size 14x13
+ LayoutText {#text} at (0,0) size 19x403
text run at (0,0) width 14: "00"
- LayoutBR {BR} at (13,0) size 1x13
- LayoutText {#text} at (0,13) size 13x13
+ text run at (13,0) width 1: " "
text run at (0,13) width 13: "01"
- LayoutBR {BR} at (12,13) size 1x13
- LayoutText {#text} at (0,26) size 14x13
+ text run at (12,13) width 1: " "
text run at (0,26) width 14: "02"
- LayoutBR {BR} at (13,26) size 1x13
- LayoutText {#text} at (0,39) size 14x13
+ text run at (13,26) width 1: " "
text run at (0,39) width 14: "03"
- LayoutBR {BR} at (13,39) size 1x13
- LayoutText {#text} at (0,52) size 14x13
+ text run at (13,39) width 1: " "
text run at (0,52) width 14: "04"
- LayoutBR {BR} at (14,52) size 0x13
- LayoutText {#text} at (0,65) size 14x13
+ text run at (14,52) width 0: " "
text run at (0,65) width 14: "05"
- LayoutBR {BR} at (13,65) size 1x13
- LayoutText {#text} at (0,78) size 14x13
+ text run at (13,65) width 1: " "
text run at (0,78) width 14: "06"
- LayoutBR {BR} at (13,78) size 1x13
- LayoutText {#text} at (0,91) size 13x13
+ text run at (13,78) width 1: " "
text run at (0,91) width 13: "07"
- LayoutBR {BR} at (12,91) size 1x13
- LayoutText {#text} at (0,104) size 14x13
+ text run at (12,91) width 1: " "
text run at (0,104) width 14: "08"
- LayoutBR {BR} at (13,104) size 1x13
- LayoutText {#text} at (0,117) size 14x13
+ text run at (13,104) width 1: " "
text run at (0,117) width 14: "09"
- LayoutBR {BR} at (13,117) size 1x13
- LayoutText {#text} at (0,130) size 13x13
+ text run at (13,117) width 1: " "
text run at (0,130) width 13: "10"
- LayoutBR {BR} at (12,130) size 1x13
- LayoutText {#text} at (0,143) size 11x13
+ text run at (12,130) width 1: " "
text run at (0,143) width 11: "11"
- LayoutBR {BR} at (10,143) size 1x13
- LayoutText {#text} at (0,156) size 19x13
+ text run at (10,143) width 1: " "
text run at (0,156) width 19: ">12"
- LayoutBR {BR} at (18,156) size 1x13
- LayoutText {#text} at (0,169) size 13x13
+ text run at (18,156) width 1: " "
text run at (0,169) width 13: "13"
- LayoutBR {BR} at (12,169) size 1x13
- LayoutText {#text} at (0,182) size 13x13
+ text run at (12,169) width 1: " "
text run at (0,182) width 13: "14"
- LayoutBR {BR} at (12,182) size 1x13
- LayoutText {#text} at (0,195) size 12x13
+ text run at (12,182) width 1: " "
text run at (0,195) width 12: "15"
- LayoutBR {BR} at (11,195) size 1x13
- LayoutText {#text} at (0,208) size 13x13
+ text run at (11,195) width 1: " "
text run at (0,208) width 13: "16"
- LayoutBR {BR} at (12,208) size 1x13
- LayoutText {#text} at (0,221) size 12x13
+ text run at (12,208) width 1: " "
text run at (0,221) width 12: "17"
- LayoutBR {BR} at (11,221) size 1x13
- LayoutText {#text} at (0,234) size 13x13
+ text run at (11,221) width 1: " "
text run at (0,234) width 13: "18"
- LayoutBR {BR} at (12,234) size 1x13
- LayoutText {#text} at (0,247) size 13x13
+ text run at (12,234) width 1: " "
text run at (0,247) width 13: "19"
- LayoutBR {BR} at (12,247) size 1x13
- LayoutText {#text} at (0,260) size 14x13
+ text run at (12,247) width 1: " "
text run at (0,260) width 14: "20"
- LayoutBR {BR} at (13,260) size 1x13
- LayoutText {#text} at (0,273) size 12x13
+ text run at (13,260) width 1: " "
text run at (0,273) width 12: "21"
- LayoutBR {BR} at (11,273) size 1x13
- LayoutText {#text} at (0,286) size 14x13
+ text run at (11,273) width 1: " "
text run at (0,286) width 14: "22"
- LayoutBR {BR} at (13,286) size 1x13
- LayoutText {#text} at (0,299) size 14x13
+ text run at (13,286) width 1: " "
text run at (0,299) width 14: "23"
- LayoutBR {BR} at (13,299) size 1x13
- LayoutText {#text} at (0,312) size 14x13
+ text run at (13,299) width 1: " "
text run at (0,312) width 14: "24"
- LayoutBR {BR} at (13,312) size 1x13
- LayoutText {#text} at (0,325) size 14x13
+ text run at (13,312) width 1: " "
text run at (0,325) width 14: "25"
- LayoutBR {BR} at (13,325) size 1x13
- LayoutText {#text} at (0,338) size 14x13
+ text run at (13,325) width 1: " "
text run at (0,338) width 14: "26"
- LayoutBR {BR} at (13,338) size 1x13
- LayoutText {#text} at (0,351) size 13x13
+ text run at (13,338) width 1: " "
text run at (0,351) width 13: "27"
- LayoutBR {BR} at (12,351) size 1x13
- LayoutText {#text} at (0,364) size 14x13
+ text run at (12,351) width 1: " "
text run at (0,364) width 14: "28"
- LayoutBR {BR} at (13,364) size 1x13
- LayoutText {#text} at (0,377) size 14x13
+ text run at (13,364) width 1: " "
text run at (0,377) width 14: "29"
- LayoutBR {BR} at (13,377) size 1x13
- LayoutText {#text} at (0,390) size 14x13
+ text run at (13,377) width 1: " "
text run at (0,390) width 14: "30"
- LayoutBR {BR} at (13,390) size 1x13
+ text run at (13,390) width 1: " "
LayoutBR {BR} at (0,403) size 0x13
-caret: position 1 of child 24 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
+caret: position 37 of child 0 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/basic-textareas-quirks-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/basic-textareas-quirks-expected.txt
index 10d2092..87233ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/basic-textareas-quirks-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/basic-textareas-quirks-expected.txt
@@ -689,203 +689,161 @@
layer at (376,879) size 141x47 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollWidth 183 scrollHeight 212
LayoutTextControl {TEXTAREA} at (14.61,1) size 141x47 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x208
- LayoutText {#text} at (0,0) size 4x13
+ LayoutText {#text} at (0,0) size 182x195
text run at (0,0) width 4: " "
- LayoutBR {BR} at (3,11) size 1x0
- LayoutText {#text} at (0,13) size 182x13
+ text run at (3,0) width 1: " "
text run at (0,13) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,26) size 182x13
+ text run at (181,13) width 1: " "
text run at (0,26) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,39) size 182x13
+ text run at (181,26) width 1: " "
text run at (0,39) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,52) size 182x13
+ text run at (181,39) width 1: " "
text run at (0,52) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,65) size 182x13
+ text run at (181,52) width 1: " "
text run at (0,65) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,78) size 182x13
+ text run at (181,65) width 1: " "
text run at (0,78) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,91) size 182x13
+ text run at (181,78) width 1: " "
text run at (0,91) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,104) size 182x13
+ text run at (181,91) width 1: " "
text run at (0,104) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,117) size 182x13
+ text run at (181,104) width 1: " "
text run at (0,117) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,130) size 182x13
+ text run at (181,117) width 1: " "
text run at (0,130) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,143) size 182x13
+ text run at (181,130) width 1: " "
text run at (0,143) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,156) size 182x13
+ text run at (181,143) width 1: " "
text run at (0,156) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,169) size 182x13
+ text run at (181,156) width 1: " "
text run at (0,169) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
- LayoutText {#text} at (0,182) size 182x13
+ text run at (181,169) width 1: " "
text run at (0,182) width 182: "This is a text area with wrap=\"soft\""
- LayoutBR {BR} at (0,0) size 0x0
+ text run at (181,182) width 1: " "
LayoutBR {BR} at (0,195) size 0x13
layer at (376,945) size 141x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 394
LayoutTextControl {TEXTAREA} at (14.61,1) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x390
- LayoutText {#text} at (0,0) size 4x13
+ LayoutText {#text} at (0,0) size 120x377
text run at (0,0) width 4: " "
- LayoutBR {BR} at (3,11) size 1x0
- LayoutText {#text} at (0,13) size 120x26
+ text run at (3,0) width 1: " "
text run at (0,13) width 116: "This is a text area with"
text run at (115,13) width 5: " "
text run at (0,26) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,37) size 1x0
- LayoutText {#text} at (0,39) size 120x26
+ text run at (62,26) width 1: " "
text run at (0,39) width 116: "This is a text area with"
text run at (115,39) width 5: " "
text run at (0,52) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,63) size 1x0
- LayoutText {#text} at (0,65) size 120x26
+ text run at (62,52) width 1: " "
text run at (0,65) width 116: "This is a text area with"
text run at (115,65) width 5: " "
text run at (0,78) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,89) size 1x0
- LayoutText {#text} at (0,91) size 120x26
+ text run at (62,78) width 1: " "
text run at (0,91) width 116: "This is a text area with"
text run at (115,91) width 5: " "
text run at (0,104) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,115) size 1x0
- LayoutText {#text} at (0,117) size 120x26
+ text run at (62,104) width 1: " "
text run at (0,117) width 116: "This is a text area with"
text run at (115,117) width 5: " "
text run at (0,130) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,141) size 1x0
- LayoutText {#text} at (0,143) size 120x26
+ text run at (62,130) width 1: " "
text run at (0,143) width 116: "This is a text area with"
text run at (115,143) width 5: " "
text run at (0,156) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,167) size 1x0
- LayoutText {#text} at (0,169) size 120x26
+ text run at (62,156) width 1: " "
text run at (0,169) width 116: "This is a text area with"
text run at (115,169) width 5: " "
text run at (0,182) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,193) size 1x0
- LayoutText {#text} at (0,195) size 120x26
+ text run at (62,182) width 1: " "
text run at (0,195) width 116: "This is a text area with"
text run at (115,195) width 5: " "
text run at (0,208) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,219) size 1x0
- LayoutText {#text} at (0,221) size 120x26
+ text run at (62,208) width 1: " "
text run at (0,221) width 116: "This is a text area with"
text run at (115,221) width 5: " "
text run at (0,234) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,245) size 1x0
- LayoutText {#text} at (0,247) size 120x26
+ text run at (62,234) width 1: " "
text run at (0,247) width 116: "This is a text area with"
text run at (115,247) width 5: " "
text run at (0,260) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,271) size 1x0
- LayoutText {#text} at (0,273) size 120x26
+ text run at (62,260) width 1: " "
text run at (0,273) width 116: "This is a text area with"
text run at (115,273) width 5: " "
text run at (0,286) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,297) size 1x0
- LayoutText {#text} at (0,299) size 120x26
+ text run at (62,286) width 1: " "
text run at (0,299) width 116: "This is a text area with"
text run at (115,299) width 5: " "
text run at (0,312) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,323) size 1x0
- LayoutText {#text} at (0,325) size 120x26
+ text run at (62,312) width 1: " "
text run at (0,325) width 116: "This is a text area with"
text run at (115,325) width 5: " "
text run at (0,338) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,349) size 1x0
- LayoutText {#text} at (0,351) size 120x26
+ text run at (62,338) width 1: " "
text run at (0,351) width 116: "This is a text area with"
text run at (115,351) width 5: " "
text run at (0,364) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,375) size 1x0
+ text run at (62,364) width 1: " "
LayoutBR {BR} at (0,377) size 0x13
layer at (376,996) size 141x32 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 394
LayoutTextControl {TEXTAREA} at (14.61,1) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x390
- LayoutText {#text} at (0,0) size 4x13
+ LayoutText {#text} at (0,0) size 120x377
text run at (0,0) width 4: " "
- LayoutBR {BR} at (3,11) size 1x0
- LayoutText {#text} at (0,13) size 120x26
+ text run at (3,0) width 1: " "
text run at (0,13) width 116: "This is a text area with"
text run at (115,13) width 5: " "
text run at (0,26) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,37) size 1x0
- LayoutText {#text} at (0,39) size 120x26
+ text run at (62,26) width 1: " "
text run at (0,39) width 116: "This is a text area with"
text run at (115,39) width 5: " "
text run at (0,52) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,63) size 1x0
- LayoutText {#text} at (0,65) size 120x26
+ text run at (62,52) width 1: " "
text run at (0,65) width 116: "This is a text area with"
text run at (115,65) width 5: " "
text run at (0,78) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,89) size 1x0
- LayoutText {#text} at (0,91) size 120x26
+ text run at (62,78) width 1: " "
text run at (0,91) width 116: "This is a text area with"
text run at (115,91) width 5: " "
text run at (0,104) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,115) size 1x0
- LayoutText {#text} at (0,117) size 120x26
+ text run at (62,104) width 1: " "
text run at (0,117) width 116: "This is a text area with"
text run at (115,117) width 5: " "
text run at (0,130) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,141) size 1x0
- LayoutText {#text} at (0,143) size 120x26
+ text run at (62,130) width 1: " "
text run at (0,143) width 116: "This is a text area with"
text run at (115,143) width 5: " "
text run at (0,156) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,167) size 1x0
- LayoutText {#text} at (0,169) size 120x26
+ text run at (62,156) width 1: " "
text run at (0,169) width 116: "This is a text area with"
text run at (115,169) width 5: " "
text run at (0,182) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,193) size 1x0
- LayoutText {#text} at (0,195) size 120x26
+ text run at (62,182) width 1: " "
text run at (0,195) width 116: "This is a text area with"
text run at (115,195) width 5: " "
text run at (0,208) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,219) size 1x0
- LayoutText {#text} at (0,221) size 120x26
+ text run at (62,208) width 1: " "
text run at (0,221) width 116: "This is a text area with"
text run at (115,221) width 5: " "
text run at (0,234) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,245) size 1x0
- LayoutText {#text} at (0,247) size 120x26
+ text run at (62,234) width 1: " "
text run at (0,247) width 116: "This is a text area with"
text run at (115,247) width 5: " "
text run at (0,260) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,271) size 1x0
- LayoutText {#text} at (0,273) size 120x26
+ text run at (62,260) width 1: " "
text run at (0,273) width 116: "This is a text area with"
text run at (115,273) width 5: " "
text run at (0,286) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,297) size 1x0
- LayoutText {#text} at (0,299) size 120x26
+ text run at (62,286) width 1: " "
text run at (0,299) width 116: "This is a text area with"
text run at (115,299) width 5: " "
text run at (0,312) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,323) size 1x0
- LayoutText {#text} at (0,325) size 120x26
+ text run at (62,312) width 1: " "
text run at (0,325) width 116: "This is a text area with"
text run at (115,325) width 5: " "
text run at (0,338) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,349) size 1x0
- LayoutText {#text} at (0,351) size 120x26
+ text run at (62,338) width 1: " "
text run at (0,351) width 116: "This is a text area with"
text run at (115,351) width 5: " "
text run at (0,364) width 63: "wrap=\"soft\""
- LayoutBR {BR} at (62,375) size 1x0
+ text run at (62,364) width 1: " "
LayoutBR {BR} at (0,377) size 0x13
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scroll-height-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scroll-height-expected.txt
index 9738805e..469a032 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scroll-height-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scroll-height-expected.txt
@@ -10,59 +10,44 @@
layer at (8,8) size 200x200 clip at (9,9) size 183x198 scrollHeight 316
LayoutTextControl {TEXTAREA} at (0,0) size 200x200 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 179x312
- LayoutText {#text} at (0,0) size 82x13
+ LayoutText {#text} at (0,0) size 82x299
text run at (0,0) width 82: "Lots of content."
- LayoutBR {BR} at (81,11) size 1x0
- LayoutText {#text} at (0,13) size 82x13
+ text run at (81,0) width 1: " "
text run at (0,13) width 82: "Lots of content."
- LayoutBR {BR} at (81,24) size 1x0
- LayoutText {#text} at (0,26) size 82x13
+ text run at (81,13) width 1: " "
text run at (0,26) width 82: "Lots of content."
- LayoutBR {BR} at (81,37) size 1x0
- LayoutText {#text} at (0,39) size 82x13
+ text run at (81,26) width 1: " "
text run at (0,39) width 82: "Lots of content."
- LayoutBR {BR} at (81,50) size 1x0
- LayoutBR {BR} at (0,52) size 0x13
- LayoutText {#text} at (0,65) size 82x13
+ text run at (81,39) width 1: " "
+ text run at (0,52) width 0: " "
text run at (0,65) width 82: "Lots of content."
- LayoutBR {BR} at (81,76) size 1x0
- LayoutText {#text} at (0,78) size 82x13
+ text run at (81,65) width 1: " "
text run at (0,78) width 82: "Lots of content."
- LayoutBR {BR} at (81,89) size 1x0
- LayoutBR {BR} at (0,91) size 0x13
- LayoutText {#text} at (0,104) size 82x13
+ text run at (81,78) width 1: " "
+ text run at (0,91) width 0: " "
text run at (0,104) width 82: "Lots of content."
- LayoutBR {BR} at (81,115) size 1x0
- LayoutText {#text} at (0,117) size 82x13
+ text run at (81,104) width 1: " "
text run at (0,117) width 82: "Lots of content."
- LayoutBR {BR} at (81,128) size 1x0
- LayoutBR {BR} at (0,130) size 0x13
- LayoutText {#text} at (0,143) size 82x13
+ text run at (81,117) width 1: " "
+ text run at (0,130) width 0: " "
text run at (0,143) width 82: "Lots of content."
- LayoutBR {BR} at (81,154) size 1x0
- LayoutText {#text} at (0,156) size 82x13
+ text run at (81,143) width 1: " "
text run at (0,156) width 82: "Lots of content."
- LayoutBR {BR} at (81,167) size 1x0
- LayoutBR {BR} at (0,169) size 0x13
- LayoutText {#text} at (0,182) size 82x13
+ text run at (81,156) width 1: " "
+ text run at (0,169) width 0: " "
text run at (0,182) width 82: "Lots of content."
- LayoutBR {BR} at (81,193) size 1x0
- LayoutText {#text} at (0,195) size 82x13
+ text run at (81,182) width 1: " "
text run at (0,195) width 82: "Lots of content."
- LayoutBR {BR} at (81,206) size 1x0
- LayoutBR {BR} at (0,208) size 0x13
- LayoutText {#text} at (0,221) size 82x13
+ text run at (81,195) width 1: " "
+ text run at (0,208) width 0: " "
text run at (0,221) width 82: "Lots of content."
- LayoutBR {BR} at (81,232) size 1x0
- LayoutText {#text} at (0,234) size 82x13
+ text run at (81,221) width 1: " "
text run at (0,234) width 82: "Lots of content."
- LayoutBR {BR} at (81,245) size 1x0
- LayoutBR {BR} at (0,247) size 0x13
- LayoutText {#text} at (0,260) size 82x13
+ text run at (81,234) width 1: " "
+ text run at (0,247) width 0: " "
text run at (0,260) width 82: "Lots of content."
- LayoutBR {BR} at (81,271) size 1x0
- LayoutText {#text} at (0,273) size 82x13
+ text run at (81,260) width 1: " "
text run at (0,273) width 82: "Lots of content."
- LayoutBR {BR} at (81,284) size 1x0
- LayoutBR {BR} at (0,286) size 0x13
+ text run at (81,273) width 1: " "
+ text run at (0,286) width 0: " "
LayoutBR {BR} at (0,299) size 0x13
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.txt
index d402bb76..432485a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.txt
@@ -10,18 +10,15 @@
layer at (8,26) size 141x84 clip at (9,27) size 124x82 scrollHeight 121
LayoutTextControl {TEXTAREA} at (0,18) size 141x84 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x117
- LayoutText {#text} at (0,0) size 6x13
+ LayoutText {#text} at (0,0) size 8x52
text run at (0,0) width 6: "1"
- LayoutBR {BR} at (5,11) size 1x0
- LayoutText {#text} at (0,13) size 7x13
+ text run at (5,0) width 1: " "
text run at (0,13) width 7: "2"
- LayoutBR {BR} at (6,24) size 1x0
- LayoutText {#text} at (0,26) size 7x13
+ text run at (6,13) width 1: " "
text run at (0,26) width 7: "3"
- LayoutBR {BR} at (6,37) size 1x0
- LayoutText {#text} at (0,39) size 8x13
+ text run at (6,26) width 1: " "
text run at (0,39) width 8: "4"
- LayoutBR {BR} at (7,50) size 1x0
+ text run at (7,39) width 1: " "
LayoutText {#text} at (0,52) size 7x13
text run at (0,52) width 7: "5"
LayoutText {#text} at (6,52) size 1x13
@@ -40,4 +37,4 @@
text run at (7,91) width 1: " "
LayoutText {#text} at (0,104) size 0x13
text run at (0,104) width 0: " "
-caret: position 0 of child 16 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
+caret: position 0 of child 9 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.txt
index 2b0fc90..fe5a1ee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.txt
@@ -10,17 +10,14 @@
layer at (8,26) size 141x32 clip at (9,27) size 124x30 scrollY 39.00 scrollHeight 69
LayoutTextControl {TEXTAREA} at (0,18) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
- LayoutText {#text} at (0,0) size 6x13
+ LayoutText {#text} at (0,0) size 8x52
text run at (0,0) width 6: "1"
- LayoutBR {BR} at (5,0) size 1x13
- LayoutText {#text} at (0,13) size 7x13
+ text run at (5,0) width 1: " "
text run at (0,13) width 7: "2"
- LayoutBR {BR} at (6,13) size 1x13
- LayoutText {#text} at (0,26) size 7x13
+ text run at (6,13) width 1: " "
text run at (0,26) width 7: "3"
- LayoutBR {BR} at (6,26) size 1x13
- LayoutText {#text} at (0,39) size 8x13
+ text run at (6,26) width 1: " "
text run at (0,39) width 8: "4"
- LayoutBR {BR} at (7,39) size 1x13
+ text run at (7,39) width 1: " "
LayoutBR {BR} at (0,52) size 0x13
-caret: position 0 of child 8 {BR} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
+caret: position 0 of child 1 {BR} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-mask-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-mask-expected.txt
index 98e5599..15d83677 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-mask-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-mask-expected.txt
@@ -10,16 +10,13 @@
layer at (8,26) size 141x32 clip at (9,27) size 124x30 transparent scrollY 39.00 scrollHeight 69
LayoutTextControl {TEXTAREA} at (0,18) size 141x32 [bgcolor=#D3D3D3] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
- LayoutText {#text} at (0,0) size 6x13
+ LayoutText {#text} at (0,0) size 8x52
text run at (0,0) width 6: "1"
- LayoutBR {BR} at (5,0) size 1x13
- LayoutText {#text} at (0,13) size 7x13
+ text run at (5,0) width 1: " "
text run at (0,13) width 7: "2"
- LayoutBR {BR} at (6,13) size 1x13
- LayoutText {#text} at (0,26) size 7x13
+ text run at (6,13) width 1: " "
text run at (0,26) width 7: "3"
- LayoutBR {BR} at (6,26) size 1x13
- LayoutText {#text} at (0,39) size 8x13
+ text run at (6,26) width 1: " "
text run at (0,39) width 8: "4"
- LayoutBR {BR} at (7,39) size 1x13
+ text run at (7,39) width 1: " "
LayoutBR {BR} at (0,52) size 0x13
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.txt
index 04aeda3..bed0687 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.txt
@@ -14,65 +14,46 @@
layer at (8,26) size 141x97 clip at (9,27) size 124x95 scrollY 182.00 scrollHeight 277
LayoutTextControl {TEXTAREA} at (0,18) size 141x97 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x273
- LayoutText {#text} at (0,0) size 6x13
+ LayoutText {#text} at (0,0) size 40x260
text run at (0,0) width 6: "1"
- LayoutBR {BR} at (5,11) size 1x0
- LayoutText {#text} at (0,13) size 7x13
+ text run at (5,0) width 1: " "
text run at (0,13) width 7: "2"
- LayoutBR {BR} at (6,24) size 1x0
- LayoutText {#text} at (0,26) size 7x13
+ text run at (6,13) width 1: " "
text run at (0,26) width 7: "3"
- LayoutBR {BR} at (6,37) size 1x0
- LayoutText {#text} at (0,39) size 8x13
+ text run at (6,26) width 1: " "
text run at (0,39) width 8: "4"
- LayoutBR {BR} at (7,50) size 1x0
- LayoutText {#text} at (0,52) size 7x13
+ text run at (7,39) width 1: " "
text run at (0,52) width 7: "5"
- LayoutBR {BR} at (6,63) size 1x0
- LayoutText {#text} at (0,65) size 7x13
+ text run at (6,52) width 1: " "
text run at (0,65) width 7: "6"
- LayoutBR {BR} at (7,76) size 0x0
- LayoutText {#text} at (0,78) size 7x13
+ text run at (7,65) width 0: " "
text run at (0,78) width 7: "7"
- LayoutBR {BR} at (6,89) size 1x0
- LayoutText {#text} at (0,91) size 8x13
+ text run at (6,78) width 1: " "
text run at (0,91) width 8: "8"
- LayoutBR {BR} at (7,102) size 1x0
- LayoutText {#text} at (0,104) size 7x13
+ text run at (7,91) width 1: " "
text run at (0,104) width 7: "9"
- LayoutBR {BR} at (7,115) size 0x0
- LayoutText {#text} at (0,117) size 13x13
+ text run at (7,104) width 0: " "
text run at (0,117) width 13: "10"
- LayoutBR {BR} at (12,128) size 1x0
- LayoutText {#text} at (0,130) size 11x13
+ text run at (12,117) width 1: " "
text run at (0,130) width 11: "11"
- LayoutBR {BR} at (10,141) size 1x0
- LayoutText {#text} at (0,143) size 12x13
+ text run at (10,130) width 1: " "
text run at (0,143) width 12: "12"
- LayoutBR {BR} at (11,154) size 1x0
- LayoutText {#text} at (0,156) size 13x13
+ text run at (11,143) width 1: " "
text run at (0,156) width 13: "13"
- LayoutBR {BR} at (12,167) size 1x0
- LayoutText {#text} at (0,169) size 13x13
+ text run at (12,156) width 1: " "
text run at (0,169) width 13: "14"
- LayoutBR {BR} at (12,180) size 1x0
- LayoutText {#text} at (0,182) size 12x13
+ text run at (12,169) width 1: " "
text run at (0,182) width 12: "15"
- LayoutBR {BR} at (11,193) size 1x0
- LayoutText {#text} at (0,195) size 13x13
+ text run at (11,182) width 1: " "
text run at (0,195) width 13: "16"
- LayoutBR {BR} at (12,206) size 1x0
- LayoutText {#text} at (0,208) size 12x13
+ text run at (12,195) width 1: " "
text run at (0,208) width 12: "17"
- LayoutBR {BR} at (11,219) size 1x0
- LayoutText {#text} at (0,221) size 40x13
+ text run at (11,208) width 1: " "
text run at (0,221) width 40: "18 Pass"
- LayoutBR {BR} at (39,232) size 1x0
- LayoutText {#text} at (0,234) size 13x13
+ text run at (39,221) width 1: " "
text run at (0,234) width 13: "19"
- LayoutBR {BR} at (12,245) size 1x0
- LayoutText {#text} at (0,247) size 14x13
+ text run at (12,234) width 1: " "
text run at (0,247) width 14: "20"
- LayoutBR {BR} at (13,258) size 1x0
+ text run at (13,247) width 1: " "
LayoutBR {BR} at (0,260) size 0x13
-caret: position 7 of child 34 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
+caret: position 49 of child 0 {#text} of child 0 {DIV} of {#document-fragment} of child 3 {TEXTAREA} of body
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-width-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-width-expected.txt
index 198bf16..18805e0d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-width-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-width-expected.txt
@@ -16,5 +16,5 @@
LayoutText {#text} at (0,0) size 540x24
text run at (0,0) width 540: "1234567890abcdefghijABCDEFGHIJ1234567890abcdefghijABCDEFGHIJ12345X7890abcdefghijABCDEFGXIJ"
text run at (0,12) width 180: "1234567890abcdefghijABCDEFGHIJ"
- LayoutBR {BR} at (179,22) size 1x0
+ text run at (179,12) width 1: " "
LayoutBR {BR} at (0,24) size 0x12
