Changeset 48698 in webkit

Timestamp:

Sep 23, 2009 7:55:39 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-09-23 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Tests for maxLength of <textarea>
​https://bugs.webkit.org/show_bug.cgi?id=29292

• fast/forms/script-tests/textarea-maxlength.js: Added.
• fast/forms/textarea-maxlength-expected.txt: Added.
• fast/forms/textarea-maxlength.html: Added.

2009-09-23 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

• Support for maxLength of <textarea>
• Move numGraphemeClusters() and numCharactersInGraphemeClusters() from InputElement to String. ​https://bugs.webkit.org/show_bug.cgi?id=29292

Test: fast/forms/textarea-maxlength.html

• dom/InputElement.cpp: (WebCore::InputElement::sanitizeUserInputValue): (WebCore::InputElement::handleBeforeTextInsertedEvent):
• html/HTMLTextAreaElement.cpp: (WebCore::HTMLTextAreaElement::defaultEventHandler): (WebCore::HTMLTextAreaElement::handleBeforeTextInsertedEvent): (WebCore::HTMLTextAreaElement::sanitizeUserInputValue): (WebCore::HTMLTextAreaElement::maxLength): (WebCore::HTMLTextAreaElement::setMaxLength):
• html/HTMLTextAreaElement.h:
• html/HTMLTextAreaElement.idl:
• platform/text/PlatformString.h:
• platform/text/String.cpp: (WebCore::String::numGraphemeClusters): (WebCore::String::numCharactersInGraphemeClusters):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/script-tests/textarea-maxlength.js (added)
• LayoutTests/fast/forms/textarea-maxlength-expected.txt (added)
• LayoutTests/fast/forms/textarea-maxlength.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/InputElement.cpp (modified) (5 diffs)
• WebCore/html/HTMLTextAreaElement.cpp (modified) (5 diffs)
• WebCore/html/HTMLTextAreaElement.h (modified) (3 diffs)
• WebCore/html/HTMLTextAreaElement.idl (modified) (1 diff)
• WebCore/platform/text/PlatformString.h (modified) (1 diff)
• WebCore/platform/text/String.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-23  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Tests for maxLength of <textarea>
+        https://bugs.webkit.org/show_bug.cgi?id=29292
+
+        * fast/forms/script-tests/textarea-maxlength.js: Added.
+        * fast/forms/textarea-maxlength-expected.txt: Added.
+        * fast/forms/textarea-maxlength.html: Added.
+
 2009-09-23  Martin Robinson  <martin.james.robinson@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-23  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        - Support for maxLength of <textarea>
+        - Move numGraphemeClusters() and numCharactersInGraphemeClusters() from InputElement to String.
+        https://bugs.webkit.org/show_bug.cgi?id=29292
+
+        Test: fast/forms/textarea-maxlength.html
+
+        * dom/InputElement.cpp:
+        (WebCore::InputElement::sanitizeUserInputValue):
+        (WebCore::InputElement::handleBeforeTextInsertedEvent):
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::defaultEventHandler):
+        (WebCore::HTMLTextAreaElement::handleBeforeTextInsertedEvent):
+        (WebCore::HTMLTextAreaElement::sanitizeUserInputValue):
+        (WebCore::HTMLTextAreaElement::maxLength):
+        (WebCore::HTMLTextAreaElement::setMaxLength):
+        * html/HTMLTextAreaElement.h:
+        * html/HTMLTextAreaElement.idl:
+        * platform/text/PlatformString.h:
+        * platform/text/String.cpp:
+        (WebCore::String::numGraphemeClusters):
+        (WebCore::String::numCharactersInGraphemeClusters):
+
 2009-09-23  Martin Robinson  <martin.james.robinson@gmail.com>
 

trunk/WebCore/dom/InputElement.cpp

@@ -35 +35 @@
 #include "SelectionController.h"
 #include "TextIterator.h"
-#include "TextBreakIterator.h"
 
 #if ENABLE(WML)
@@ -160 +159 @@
 }
 
-static int numCharactersInGraphemeClusters(StringImpl* s, int numGraphemeClusters)
-{
-    if (!s)
-        return 0;
-
-    TextBreakIterator* it = characterBreakIterator(s->characters(), s->length());
-    if (!it)
-        return 0;
-
-    for (int i = 0; i < numGraphemeClusters; ++i) {
-        if (textBreakNext(it) == TextBreakDone)
-            return s->length();
-    }
-
-    return textBreakCurrent(it);
-}
-
 String InputElement::sanitizeValue(const InputElement* inputElement, const String& proposedValue)
 {
@@ -192 +174 @@
     string.replace('\n', ' ');
 
-    StringImpl* s = string.impl();
-    int newLength = numCharactersInGraphemeClusters(s, maxLength);
-    for (int i = 0; i < newLength; ++i) {
-        const UChar& current = (*s)[i];
+    unsigned newLength = string.numCharactersInGraphemeClusters(maxLength);
+    for (unsigned i = 0; i < newLength; ++i) {
+        const UChar current = string[i];
         if (current < ' ' && current != '\t') {
             newLength = i;
@@ -201 +182 @@
         }
     }
-
-    if (newLength < static_cast<int>(string.length()))
-        return string.left(newLength);
-
-    return string;
-}
-
-static int numGraphemeClusters(StringImpl* s)
-{
-    if (!s)
-        return 0;
-
-    TextBreakIterator* it = characterBreakIterator(s->characters(), s->length());
-    if (!it)
-        return 0;
-
-    int num = 0;
-    while (textBreakNext(it) != TextBreakDone)
-        ++num;
-
-    return num;
+    return string.left(newLength);
 }
 
@@ -232 +193 @@
     // because they can be mismatched by sanitizeValue() in
     // RenderTextControlSingleLine::subtreeHasChanged() in some cases.
-    int oldLength = numGraphemeClusters(toRenderTextControlSingleLine(element->renderer())->text().impl());
+    unsigned oldLength = toRenderTextControlSingleLine(element->renderer())->text().numGraphemeClusters();
 
     // selection() may be a pre-edit text.
-    int selectionLength = numGraphemeClusters(plainText(element->document()->frame()->selection()->selection().toNormalizedRange().get()).impl());
+    unsigned selectionLength = plainText(element->document()->frame()->selection()->selection().toNormalizedRange().get()).numGraphemeClusters();
     ASSERT(oldLength >= selectionLength);
 
     // Selected characters will be removed by the next text event.
-    int baseLength = oldLength - selectionLength;
-    int appendableLength = data.maxLength() - baseLength;
+    unsigned baseLength = oldLength - selectionLength;
+    unsigned maxLength = static_cast<unsigned>(data.maxLength()); // maxLength() can never be negative.
+    unsigned appendableLength = maxLength > baseLength ? maxLength - baseLength : 0;
 
     // Truncate the inserted text to avoid violating the maxLength and other constraints.

trunk/WebCore/html/HTMLTextAreaElement.cpp

@@ -27 +27 @@
 #include "HTMLTextAreaElement.h"
 
+#include "BeforeTextInsertedEvent.h"
 #include "ChromeClient.h"
 #include "CSSValueKeywords.h"
@@ -36 +37 @@
 #include "Frame.h"
 #include "HTMLNames.h"
+#include "InputElement.h"
 #include "MappedAttribute.h"
 #include "Page.h"
@@ -42 +44 @@
 #include "ScriptEventListener.h"
 #include "Text.h"
+#include "TextIterator.h"
 #include "VisibleSelection.h"
 #include <wtf/StdLibExtras.h>
@@ -271 +274 @@
     if (renderer() && (event->isMouseEvent() || event->isDragEvent() || event->isWheelEvent() || event->type() == eventNames().blurEvent))
         toRenderTextControlMultiLine(renderer())->forwardEvent(event);
+    else if (renderer() && event->isBeforeTextInsertedEvent())
+        handleBeforeTextInsertedEvent(static_cast<BeforeTextInsertedEvent*>(event));
 
     HTMLFormControlElementWithState::defaultEventHandler(event);
+}
+
+void HTMLTextAreaElement::handleBeforeTextInsertedEvent(BeforeTextInsertedEvent* event) const
+{
+    ASSERT(event);
+    ASSERT(renderer());
+    bool ok;
+    unsigned maxLength = getAttribute(maxlengthAttr).string().toUInt(&ok);
+    if (!ok)
+        return;
+
+    unsigned currentLength = toRenderTextControl(renderer())->text().numGraphemeClusters();
+    unsigned selectionLength = plainText(document()->frame()->selection()->selection().toNormalizedRange().get()).numGraphemeClusters();
+    ASSERT(currentLength >= selectionLength);
+    unsigned baseLength = currentLength - selectionLength;
+    unsigned appendableLength = maxLength > baseLength ? maxLength - baseLength : 0;
+    event->setText(sanitizeUserInputValue(event->text(), appendableLength));
+}
+
+String HTMLTextAreaElement::sanitizeUserInputValue(const String& proposedValue, unsigned maxLength)
+{
+    return proposedValue.left(proposedValue.numCharactersInGraphemeClusters(maxLength));
 }
 
@@ -375 +402 @@
 }
 
+unsigned HTMLTextAreaElement::maxLength() const
+{
+    return getAttribute(maxlengthAttr).string().toUInt();
+}
+
+void HTMLTextAreaElement::setMaxLength(unsigned newValue)
+{
+    setAttribute(maxlengthAttr, String::number(newValue));
+}
+
 void HTMLTextAreaElement::accessKeyAction(bool)
 {

trunk/WebCore/html/HTMLTextAreaElement.h

@@ -29 +29 @@
 namespace WebCore {
 
+class BeforeTextInsertedEvent;
 class VisibleSelection;
 
@@ -79 +80 @@
     void setDefaultValue(const String&);
     int textLength() const { return value().length(); }
+    unsigned maxLength() const;
+    void setMaxLength(unsigned);
     
     void rendererWillBeDestroyed();
@@ -100 +103 @@
     enum WrapMethod { NoWrap, SoftWrap, HardWrap };
 
+    void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*) const;
+    static String sanitizeUserInputValue(const String&, unsigned maxLength);
     void updateValue() const;
     void updatePlaceholderVisibility(bool placeholderValueChanged);

trunk/WebCore/html/HTMLTextAreaElement.idl

@@ -35 +35 @@
                  attribute  boolean              disabled;
                  attribute  boolean              autofocus;
+                 attribute  unsigned long        maxLength;
                  attribute  [ConvertNullToNullString] DOMString            name;
                  attribute  [ConvertNullToNullString, Reflect] DOMString   placeholder;

trunk/WebCore/platform/text/PlatformString.h

@@ -255 +255 @@
     WTF::Unicode::Direction defaultWritingDirection() const { return m_impl ? m_impl->defaultWritingDirection() : WTF::Unicode::LeftToRight; }
 
+    // Counts the number of grapheme clusters. A surrogate pair or a sequence
+    // of a non-combining character and following combining characters is
+    // counted as 1 grapheme cluster.
+    unsigned numGraphemeClusters() const;
+    // Returns the number of characters which will be less than or equal to
+    // the specified grapheme cluster length.
+    unsigned numCharactersInGraphemeClusters(unsigned) const;
+
 private:
     RefPtr<StringImpl> m_impl;

trunk/WebCore/platform/text/String.cpp

@@ -26 +26 @@
 #include "FloatConversion.h"
 #include "StringBuffer.h"
+#include "TextBreakIterator.h"
 #include "TextEncoding.h"
 #include <wtf/dtoa.h>
@@ -922 +923 @@
 }
 
+unsigned String::numGraphemeClusters() const
+{
+    TextBreakIterator* it = characterBreakIterator(characters(), length());
+    if (!it)
+        return length();
+
+    unsigned num = 0;
+    while (textBreakNext(it) != TextBreakDone)
+        ++num;
+    return num;
+}
+
+unsigned String::numCharactersInGraphemeClusters(unsigned numGraphemeClusters) const
+{
+    TextBreakIterator* it = characterBreakIterator(characters(), length());
+    if (!it)
+        return min(length(), numGraphemeClusters);
+
+    for (unsigned i = 0; i < numGraphemeClusters; ++i) {
+        if (textBreakNext(it) == TextBreakDone)
+            return length();
+    }
+    return textBreakCurrent(it);
+}
+
 } // namespace WebCore