Changeset 63879 in webkit

Timestamp:

Jul 22, 2010 1:20:47 AM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-07-22 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Small refactoring for input value sanitization
​https://bugs.webkit.org/show_bug.cgi?id=42807

Rename some functions to clarify their roles.

• dom/InputElement.cpp: (WebCore::replaceEOLAndLimitLength): Renamed from sanitizeUserInputValue(). (WebCore::InputElement::sanitizeValueForTextField): Renamed from sanitizeValue(), and call replaceEOLAndLimitLength() instead of sanitizeUserInputValue(). (WebCore::InputElement::sanitizeUserInputValue): Just call replaceEOLAndLimitLength(). (WebCore::InputElement::updateValueIfNeeded): Use non-static sanitizeValue() for consistency.
• dom/InputElement.h:
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::setInputType): Revert the change of r63876. It is not needed because of the updateValueIfNeeded() change. (WebCore::HTMLInputElement::sanitizeValue): Apply the sanitizeValue() renaming.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/InputElement.cpp (modified) (3 diffs)
• dom/InputElement.h (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-22  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Small refactoring for input value sanitization
+        https://bugs.webkit.org/show_bug.cgi?id=42807
+
+        Rename some functions to clarify their roles.
+
+        * dom/InputElement.cpp:
+        (WebCore::replaceEOLAndLimitLength):
+          Renamed from sanitizeUserInputValue().
+        (WebCore::InputElement::sanitizeValueForTextField):
+          Renamed from sanitizeValue(), and call replaceEOLAndLimitLength()
+          instead of sanitizeUserInputValue().
+        (WebCore::InputElement::sanitizeUserInputValue):
+          Just call replaceEOLAndLimitLength().
+        (WebCore::InputElement::updateValueIfNeeded):
+          Use non-static sanitizeValue() for consistency.
+        * dom/InputElement.h:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setInputType):
+          Revert the change of r63876. It is not needed because of the
+          updateValueIfNeeded() change.
+        (WebCore::HTMLInputElement::sanitizeValue):
+          Apply the sanitizeValue() renaming.
+
 2010-07-22  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebCore/dom/InputElement.cpp

@@ -146 +146 @@
 }
 
-String InputElement::sanitizeValue(const InputElement* inputElement, const String& proposedValue)
-{
-#if ENABLE(WCSS)
-    InputElementData data = const_cast<InputElement*>(inputElement)->data();
-    if (!isConformToInputMask(data, proposedValue)) {
-        if (isConformToInputMask(data, data.value()))
-            return data.value();
-        return String();
-    }
-#endif
-    return InputElement::sanitizeUserInputValue(inputElement, proposedValue, s_maximumLength);
-}
-
-String InputElement::sanitizeUserInputValue(const InputElement* inputElement, const String& proposedValue, int maxLength)
+static String replaceEOLAndLimitLength(const InputElement* inputElement, const String& proposedValue, int maxLength)
 {
     if (!inputElement->isTextField())
@@ -178 +165 @@
     }
     return string.left(newLength);
+}
+
+String InputElement::sanitizeValueForTextField(const InputElement* inputElement, const String& proposedValue)
+{
+#if ENABLE(WCSS)
+    InputElementData data = const_cast<InputElement*>(inputElement)->data();
+    if (!isConformToInputMask(data, proposedValue)) {
+        if (isConformToInputMask(data, data.value()))
+            return data.value();
+        return String();
+    }
+#endif
+    return replaceEOLAndLimitLength(inputElement, proposedValue, s_maximumLength);
+}
+
+String InputElement::sanitizeUserInputValue(const InputElement* inputElement, const String& proposedValue, int maxLength)
+{
+    return replaceEOLAndLimitLength(inputElement, proposedValue, maxLength);
 }
 
@@ -246 +251 @@
 {
     String oldValue = data.value();
-    String newValue = sanitizeValue(inputElement, oldValue);
+    String newValue = inputElement->sanitizeValue(oldValue);
     if (newValue != oldValue)
         inputElement->setValue(newValue);

trunk/WebCore/dom/InputElement.h

@@ -79 +79 @@
     // Replaces CRs and LFs, shrinks the value for s_maximumLength.
     // This should be applied to values from the HTML value attribute and the DOM value property.
-    static String sanitizeValue(const InputElement*, const String&);
+    // This function should be called only by sanitizeValue() implementations.
+    static String sanitizeValueForTextField(const InputElement*, const String&);
     // Replaces CRs and LFs, shrinks the value for the specified maximum length.
     // This should be applied to values specified by users.
+    // The input string may be a fragment of the whole value.
     static String sanitizeUserInputValue(const InputElement*, const String&, int);
     static void handleBeforeTextInsertedEvent(InputElementData&, InputElement*, Element*, Event*);

trunk/WebCore/html/HTMLInputElement.cpp

@@ -864 +864 @@
             if (!didStoreValue && willStoreValue)
                 m_data.setValue(sanitizeValue(getAttribute(valueAttr)));
-            else {
-                String oldValue = m_data.value();
-                String newValue = sanitizeValue(oldValue);
-                if (newValue != oldValue)
-                    setValue(newValue);
-            }
+            else
+                InputElement::updateValueIfNeeded(m_data, this);
 
             if (wasPasswordField && !isPasswordField)
@@ -2567 +2563 @@
 {
     if (isTextField())
-        return InputElement::sanitizeValue(this, proposedValue);
+        return InputElement::sanitizeValueForTextField(this, proposedValue);
 
     // If the proposedValue is null than this is a reset scenario and we