Changeset 164329 in webkit

Timestamp:

Feb 18, 2014 4:04:07 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

TextFieldInputType::handleBeforeTextInsertedEvent shouldn't use plainText
​https://bugs.webkit.org/show_bug.cgi?id=128953

Reviewed by Alexey Proskuryakov.

Don't use FrameSelection's toNormalizedRange and plainText. Instead, use the cached selection start and selection
end to extract the selected text. The caches are updated inside FrameSelection::setSelection whenever selection
is inside a text form control via HTMLTextFormControlElement::selectionChanged.

• html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/TextFieldInputType.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        TextFieldInputType::handleBeforeTextInsertedEvent shouldn't use plainText
+        https://bugs.webkit.org/show_bug.cgi?id=128953
+
+        Reviewed by Alexey Proskuryakov.
+
+        Don't use FrameSelection's toNormalizedRange and plainText. Instead, use the cached selection start and selection
+        end to extract the selected text. The caches are updated inside FrameSelection::setSelection whenever selection
+        is inside a text form control via HTMLTextFormControlElement::selectionChanged.
+
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::handleBeforeTextInsertedEvent):
+
 2014-02-18  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
 

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -375 +375 @@
     // because they can be mismatched by sanitizeValue() in
     // HTMLInputElement::subtreeHasChanged() in some cases.
-    unsigned oldLength = numGraphemeClusters(element().innerTextValue());
+    String innerText = element().innerTextValue();
+    unsigned oldLength = numGraphemeClusters(innerText);
 
     // selectionLength represents the selection length of this text field to be
@@ -382 +383 @@
     // selection length. The selection is the source of text drag-and-drop in
     // that case, and nothing in the text field will be removed.
-    unsigned selectionLength = element().focused() ? numGraphemeClusters(plainText(element().document().frame()->selection().selection().toNormalizedRange().get())) : 0;
+    unsigned selectionLength = 0;
+    if (element().focused()) {
+        ASSERT(enclosingTextFormControl(element().document().frame()->selection().selection().start()) == &element());
+        selectionLength = numGraphemeClusters(innerText.substring(element().selectionStart(), element().selectionEnd()));
+    }
     ASSERT(oldLength >= selectionLength);