Skip to content

GitLab

T
tangled
Commit 73a59b84 authored by tkent's avatar tkent Committed by Commit bot
Browse files
Options

Don't collapse whitespace in contenteditable=plaintext-only. 

Rewrite white-space property for contenteditable=plaintext-only elements as:
    normal   -> pre-wrap
    nowrap   -> pre
    pre-line -> pre-wrap
because whitespace collapsing doesn't make sense in plain-text editing.
The new behavior matches to Microsoft Edge for TEXTAREA.

BUG=595491

Review URL: https://codereview.chromium.org/1813663002

Cr-Commit-Position: refs/heads/master@{#381668}
parent 73bd7ce8
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 23 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 73a59b84
......@@ -438,7 +438,8 @@ crbug.com/580355 virtual/spv2/fast/block/positioning/height-change.html [ Pass ]
crbug.com/580355 virtual/spv2/fast/block/positioning/relayout-on-position-change.html [ Pass ]
crbug.com/563667 virtual/spv2/fast/overflow/007.html [ Failure ]
crbug.com/595491 editing/pasteboard/8145-1.html [ NeedsRebaseline ]
crbug.com/595491 fast/forms/textarea/basic-textareas.html [ NeedsRebaseline ]
crbug.com/537409 virtual/spv2/fast/overflow [ Pass ]
# Sub-pixel differences in layout tests for SPv2
crbug.com/589265 virtual/spv2/fast/block/float/002.html [ Failure ]
......
third_party/WebKit/LayoutTests/accessibility/is-richly-editable-expected.txt
View file @ 73a59b84
......@@ -24,8 +24,11 @@ Some text.
Some text.
Some text.
Some text.
Some text.
......
third_party/WebKit/LayoutTests/editing/input/textarea-white-space-normal-trailing-space-expected.html 0 → 100644
View file @ 73a59b84
<!DOCTYPE html>
<textarea style="white-space:pre-wrap">a b </textarea>
<script>
var textarea = document.querySelector('textarea');
textarea.focus();
textarea.selectionStart = 4;
textarea.selectionEnd = 4;
</script>
third_party/WebKit/LayoutTests/editing/input/textarea-white-space-normal-trailing-space.html 0 → 100644
View file @ 73a59b84
<!DOCTYPE html>
<textarea style="white-space:normal"></textarea>
<script>
// We should be able to type ' ' into a TEXTAREA with white-space:normal,
// and the result should be identical to another TEXTAREA with
// white-space:pre-wrap.
document.querySelector('textarea').focus();
eventSender.keyDown('a')
eventSender.keyDown(' ')
eventSender.keyDown('b')
eventSender.keyDown(' ')
</script>
third_party/WebKit/LayoutTests/fast/css-grid-layout/stale-grid-layout-2-expected.txt
View file @ 73a59b84
XThe test checks that we don't leave stale pointers into the internal grid representation.
This test has PASSED if it didn't crash under ASAN.
This test has PASSED if it didn't crash under ASAN.
third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/8145-1-expected.txt
View file @ 73a59b84
......@@ -9,7 +9,11 @@ layer at (0,0) size 800x600
LayoutBlockFlow {P} at (0,0) size 784x18
LayoutText {#text} at (0,0) size 431x18
text run at (0,0) width 431: "This is a replica of the paste that caused the crash covered by 8145."
LayoutBlockFlow {DIV} at (0,34) size 784x20 [border: (1px solid #000000)]
LayoutText {#text} at (1,1) size 72x18
text run at (1,1) width 72: "foo bar baz"
caret: position 11 of child 0 {#text} of child 2 {DIV} of body
LayoutBlockFlow {DIV} at (0,34) size 784x38 [border: (1px solid #000000)]
LayoutBlockFlow (anonymous) at (1,1) size 782x18
LayoutText {#text} at (0,0) size 72x18
text run at (0,0) width 72: "foo bar baz"
text run at (71,0) width 1: " "
LayoutBlockFlow {DIV} at (1,19) size 782x18
LayoutBR {BR} at (0,0) size 0x18
caret: position 0 of child 0 {BR} of child 1 {DIV} of child 2 {DIV} of body
third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/basic-textareas-expected.txt
View file @ 73a59b84
......@@ -611,10 +611,11 @@ layer at (0,0) size 785x644 backgroundClip at (0,0) size 785x600 clip at (0,0) s
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
LayoutText {#text} at (0,0) size 120x65
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 28: "dolor"
text run at (0,0) width 100: "Lorem ipsum dolor"
text run at (99,0) width 4: " "
text run at (0,13) width 116: "ABCDEFGHIJKLMNOP"
text run at (0,26) width 78: "QRSTUVWXYZ"
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (144,500) size 141x32 clip at (145,501) size 124x15 scrollWidth 426 scrollHeight 17
......@@ -633,20 +634,20 @@ layer at (0,0) size 785x644 backgroundClip at (0,0) size 785x600 clip at (0,0) s
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (430,500) size 141x32 clip at (431,501) size 124x15 scrollWidth 423 scrollHeight 17
layer at (430,500) size 141x32 clip at (431,501) size 124x15 scrollWidth 426 scrollHeight 17
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 135x13
LayoutText {#text} at (0,0) size 422x13
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 353: "dolor ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuv"
LayoutText {#text} at (0,0) size 425x13
text run at (0,0) width 425: "Lorem ipsum dolor ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuv"
layer at (573,500) size 141x32 clip at (574,501) size 124x30 scrollHeight 69
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
LayoutText {#text} at (0,0) size 120x65
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 28: "dolor"
text run at (0,0) width 100: "Lorem ipsum dolor"
text run at (99,0) width 4: " "
text run at (0,13) width 116: "ABCDEFGHIJKLMNOP"
text run at (0,26) width 78: "QRSTUVWXYZ"
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (1,593) size 141x47 clip at (2,594) size 124x30 scrollWidth 195 scrollHeight 43
......@@ -1338,10 +1339,11 @@ layer at (0,644) size 785x620 backgroundClip at (0,0) size 785x600 clip at (0,0)
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
LayoutText {#text} at (0,0) size 120x65
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 28: "dolor"
text run at (0,0) width 100: "Lorem ipsum dolor"
text run at (99,0) width 4: " "
text run at (0,13) width 116: "ABCDEFGHIJKLMNOP"
text run at (0,26) width 78: "QRSTUVWXYZ"
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (144,482) size 141x32 clip at (145,483) size 124x15 scrollWidth 426 scrollHeight 17
......@@ -1360,20 +1362,20 @@ layer at (0,644) size 785x620 backgroundClip at (0,0) size 785x600 clip at (0,0)
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (430,482) size 141x32 clip at (431,483) size 124x15 scrollWidth 423 scrollHeight 17
layer at (430,482) size 141x32 clip at (431,483) size 124x15 scrollWidth 426 scrollHeight 17
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 135x13
LayoutText {#text} at (0,0) size 422x13
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 353: "dolor ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuv"
LayoutText {#text} at (0,0) size 425x13
text run at (0,0) width 425: "Lorem ipsum dolor ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuv"
layer at (573,482) size 141x32 clip at (574,483) size 124x30 scrollHeight 69
LayoutTextControl {TEXTAREA} at (1,29) size 141x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
LayoutBlockFlow {DIV} at (3,3) size 120x65
LayoutText {#text} at (0,0) size 120x65
text run at (0,0) width 70: "Lorem ipsum "
text run at (69,0) width 28: "dolor"
text run at (0,0) width 100: "Lorem ipsum dolor"
text run at (99,0) width 4: " "
text run at (0,13) width 116: "ABCDEFGHIJKLMNOP"
text run at (0,26) width 78: "QRSTUVWXYZ"
text run at (77,26) width 4: " "
text run at (0,39) width 120: "abcdefghijklmnopqrstu"
text run at (0,52) width 6: "v"
layer at (1,572) size 141x47 clip at (2,573) size 124x30 scrollWidth 195 scrollHeight 43
......
third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
View file @ 73a59b84
......@@ -231,6 +231,8 @@ void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyl
|| style.hasFilter()))
style.setTransformStyle3D(TransformStyle3DFlat);
adjustStyleForEditing(style);
bool isSVGElement = element && element->isSVGElement();
if (isSVGElement) {
// Only the root <svg> element in an SVG document fragment tree honors css position
......@@ -248,6 +250,19 @@ void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, const ComputedStyl
adjustStyleForAlignment(style, parentStyle);
}
void StyleAdjuster::adjustStyleForEditing(ComputedStyle& style)
{
if (style.userModify() != READ_WRITE_PLAINTEXT_ONLY)
return;
// Collapsing whitespace is harmful in plain-text editing.
if (style.whiteSpace() == NORMAL)
style.setWhiteSpace(PRE_WRAP);
else if (style.whiteSpace() == NOWRAP)
style.setWhiteSpace(PRE);
else if (style.whiteSpace() == PRE_LINE)
style.setWhiteSpace(PRE_WRAP);
}
void StyleAdjuster::adjustStyleForFirstLetter(ComputedStyle& style)
{
if (style.styleType() != PseudoIdFirstLetter)
......
third_party/WebKit/Source/core/css/resolver/StyleAdjuster.h
View file @ 73a59b84
......@@ -41,6 +41,7 @@ public:
{ }
void adjustComputedStyle(ComputedStyle& styleToAdjust, const ComputedStyle& parentStyle, Element*);
static void adjustStyleForEditing(ComputedStyle&);
private:
void adjustStyleForFirstLetter(ComputedStyle&);
......
third_party/WebKit/Source/core/html/shadow/TextControlInnerElements.cpp
View file @ 73a59b84
......@@ -27,6 +27,7 @@
#include "core/html/shadow/TextControlInnerElements.h"
#include "core/HTMLNames.h"
#include "core/css/resolver/StyleAdjuster.h"
#include "core/dom/Document.h"
#include "core/dom/NodeComputedStyle.h"
#include "core/events/MouseEvent.h"
......@@ -142,7 +143,11 @@ PassRefPtr<ComputedStyle> TextControlInnerEditorElement::customStyleForLayoutObj
if (!parentLayoutObject || !parentLayoutObject->isTextControl())
return originalStyleForLayoutObject();
LayoutTextControlItem textControlLayoutItem = LayoutTextControlItem(toLayoutTextControl(parentLayoutObject));
return textControlLayoutItem.createInnerEditorStyle(textControlLayoutItem.styleRef());
RefPtr<ComputedStyle> innerEditorStyle = textControlLayoutItem.createInnerEditorStyle(textControlLayoutItem.styleRef());
// Using StyleAdjuster::adjustComputedStyle updates unwanted style. We'd like
// to apply only editing-related.
StyleAdjuster::adjustStyleForEditing(*innerEditorStyle);
return innerEditorStyle.release();
}
// ----------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment