Changeset 293673 in webkit

Timestamp:

May 2, 2022 12:12:06 PM (3 months ago)

Author:

Ziran Sun

Message:

[selection] Set correct selection range for TEXTAREA when updating default value
​https://bugs.webkit.org/show_bug.cgi?id=237525

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra-expected.txt:

Source/WebCore:

Updating defaultValue should keep selectionStart/End. We need clamp them if the new value is shorter than the
selectionStart/End. This change is to be in line with [1] & [2].

[1] ​https://html.spec.whatwg.org/multipage/form-elements.html#the-textarea-element:dom-textarea-defaultvalue-2
[2] ​https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#textFieldSelection:concept-textarea/input-relevant-value

Part of this change is an import of Chromium CL at
​https://github.com/chromium/chromium/commit/bb27a500d07f8b3c567e84857a40c3ce42fa454a

• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::childrenChanged):
(WebCore::HTMLTextAreaElement::setValueCommon):

• html/HTMLTextFormControlElement.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLTextFormControlElement.h (modified) (3 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-05-02  Ziran Sun  <zsun@igalia.com>
+
+        [selection] Set correct selection range for TEXTAREA when updating default value
+        https://bugs.webkit.org/show_bug.cgi?id=237525
+
+        Reviewed by  Chris Dumez.
+
+        * web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra-expected.txt:
+
 2022-05-02  Oriol Brufau  <obrufau@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/textfieldselection/selection-start-end-extra-expected.txt

@@ -6 +6 @@
 PASS Removing children from a textarea should NOT update selection{Start,End}
 PASS Setting the same value (with different newlines) in a textarea should NOT update selection{Start,End}
-FAIL Removing child nodes in non-dirty textarea should make selection{Start,End} 0 assert_equals: selectionStart after node removal expected 0 but got 3
+PASS Removing child nodes in non-dirty textarea should make selection{Start,End} 0
 PASS Setting value to a shorter string than defaultValue should correct the cursor position
 PASS Shortening value by turning the input type into 'url' should correct selection{Start,End}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-02  Ziran Sun  <zsun@igalia.com>
+
+        [selection] Set correct selection range for TEXTAREA when updating default value
+        https://bugs.webkit.org/show_bug.cgi?id=237525
+
+        Reviewed by  Chris Dumez.
+
+        Updating defaultValue should keep selectionStart/End. We need clamp them if the new value is shorter than the
+        selectionStart/End. This change is to be in line with [1] & [2].
+        
+        [1] https://html.spec.whatwg.org/multipage/form-elements.html#the-textarea-element:dom-textarea-defaultvalue-2
+        [2] https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#textFieldSelection:concept-textarea/input-relevant-value
+
+        Part of this change is an import of Chromium CL at
+        https://github.com/chromium/chromium/commit/bb27a500d07f8b3c567e84857a40c3ce42fa454a
+
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::childrenChanged):
+        (WebCore::HTMLTextAreaElement::setValueCommon):
+        * html/HTMLTextFormControlElement.h:
+
 2022-05-02  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -137 +137 @@
         setInnerTextValue(value());
     else
-        setNonDirtyValue(defaultValue(),  TextControlSetValueSelection::DoNotSet);
+        setNonDirtyValue(defaultValue(), TextControlSetValueSelection::Clamp);
 }
 
@@ -402 +402 @@
         return;
 
+    bool shouldClamp = selection == TextControlSetValueSelection::Clamp;
+    auto selectionStartValue = shouldClamp ? computeSelectionStart() : 0;
+    auto selectionEndValue = shouldClamp ? computeSelectionEnd() : 0;
+
     m_value = normalizedValue;
     setInnerTextValue(String { m_value });
@@ -409 +413 @@
     setFormControlValueMatchesRenderer(true);
 
-    if (document().focusedElement() == this) {
-        unsigned endOfString = m_value.length();
+    auto endOfString = m_value.length();
+    if (document().focusedElement() == this)
         setSelectionRange(endOfString, endOfString);
-    }  else if (selection == TextControlSetValueSelection::SetSelectionToEnd) {
+    else if (selection == TextControlSetValueSelection::SetSelectionToEnd) {
         // We don't change text selection here but need to update caret to
         // the end of the text value except for initialize.
-        unsigned endOfString = m_value.length();
         cacheSelection(endOfString, endOfString, SelectionHasNoDirection);
-    }
+    } else if (shouldClamp)
+        cacheSelection(std::min(endOfString, selectionStartValue), std::min(endOfString, selectionEndValue), SelectionHasNoDirection);
 
     setTextAsOfLastFormControlChangeEvent(normalizedValue);

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -40 +40 @@
 enum TextFieldSelectionDirection { SelectionHasNoDirection, SelectionHasForwardDirection, SelectionHasBackwardDirection };
 enum TextFieldEventBehavior { DispatchNoEvent, DispatchChangeEvent, DispatchInputAndChangeEvent };
-enum TextControlSetValueSelection { SetSelectionToEnd, DoNotSet };
+enum TextControlSetValueSelection { SetSelectionToEnd, Clamp, DoNotSet };
 
 class HTMLTextFormControlElement : public HTMLFormControlElementWithState {
@@ -124 +124 @@
     bool hasCachedSelection() const { return m_hasCachedSelection; }
 
+    unsigned computeSelectionStart() const;
+    unsigned computeSelectionEnd() const;
+
     virtual void subtreeHasChanged() = 0;
 
@@ -140 +143 @@
     bool isTextFormControlElement() const final { return true; }
 
-    unsigned computeSelectionStart() const;
-    unsigned computeSelectionEnd() const;
     TextFieldSelectionDirection computeSelectionDirection() const;