INPUT element: Updating 'step' attribute should adjust the last value.

third_party/WebKit/Source/core/html/HTMLInputElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
@@ skipping 369 matching lines @@
 
 void HTMLInputElement::initializeTypeInParsing() {
   DCHECK(m_parsingInProgress);
   DCHECK(!m_inputType);
   DCHECK(!m_inputTypeView);
 
   const AtomicString& newTypeName =
       InputType::normalizeTypeName(fastGetAttribute(typeAttr));
   m_inputType = InputType::create(*this, newTypeName);
   m_inputTypeView = m_inputType->createView();
+  String defaultValue = fastGetAttribute(valueAttr);
+  if (m_inputType->valueMode() == ValueMode::kValue)
+    m_valueIfDirty = sanitizeValue(defaultValue);
   ensureUserAgentShadowRoot();
 
   setNeedsWillValidateCheck();
 
-  m_inputType->warnIfValueIsInvalid(fastGetAttribute(valueAttr).getString());
+  if (!defaultValue.isNull())
+    m_inputType->warnIfValueIsInvalid(defaultValue);
 
   m_inputTypeView->updateView();
   setTextAsOfLastFormControlChangeEvent(value());
   setChangedSinceLastFormControlChangeEvent(false);
 }
 
 void HTMLInputElement::updateType() {
   DCHECK(m_inputType);
   DCHECK(m_inputTypeView);
 
@@ skipping 23 matching lines @@
 
   // https://html.spec.whatwg.org/multipage/forms.html#input-type-change
   //
   // 1. If the previous state of the element's type attribute put the value IDL
   // attribute in the value mode, and the element's value is not the empty
   // string, and the new state of the element's type attribute puts the value
   // IDL attribute in either the default mode or the default/on mode, then set
   // the element's value content attribute to the element's value.
   if (oldValueMode == ValueMode::kValue &&
       (newValueMode == ValueMode::kDefault ||
-       newValueMode == ValueMode::kDefaultOn) &&
-      hasDirtyValue()) {
-    setAttribute(valueAttr, AtomicString(m_valueIfDirty));
+       newValueMode == ValueMode::kDefaultOn)) {
+    if (hasDirtyValue())
+      setAttribute(valueAttr, AtomicString(m_valueIfDirty));
     m_valueIfDirty = String();
     m_hasDirtyValue = false;
   }
   // 2. Otherwise, if the previous state of the element's type attribute put the
   // value IDL attribute in any mode other than the value mode, and the new
   // state of the element's type attribute puts the value IDL attribute in the
   // value mode, then set the value of the element to the value of the value
   // content attribute, if there is one, or the empty string otherwise, and then
   // set the control's dirty value flag to false.
   else if (oldValueMode != ValueMode::kValue &&
            newValueMode == ValueMode::kValue) {
     AtomicString valueString = fastGetAttribute(valueAttr);
     m_inputType->warnIfValueIsInvalid(valueString);
-    m_valueIfDirty = String();
+    m_valueIfDirty = sanitizeValue(valueString);
     m_hasDirtyValue = false;
   }
   // 3. Otherwise, if the previous state of the element's type attribute put the
   // value IDL attribute in any mode other than the filename mode, and the new
   // state of the element's type attribute puts the value IDL attribute in the
   // filename mode, then set the value of the element to the empty string.
   else if (oldValueMode != ValueMode::kFilename &&
            newValueMode == ValueMode::kFilename) {
     m_valueIfDirty = String();
     m_hasDirtyValue = false;
 
   } else {
-    if (!hasDirtyValue())
-      m_inputType->warnIfValueIsInvalid(
-          fastGetAttribute(valueAttr).getString());
-    String newValue = sanitizeValue(m_valueIfDirty);
-    DCHECK(!m_valueIfDirty.isNull() || newValue.isNull());
-    if (newValue != m_valueIfDirty)
-      setValue(newValue);
+    // ValueMode wasn't changed, or kDefault <-> kDefaultOn.
+    if (!hasDirtyValue()) {
+      String defaultValue = fastGetAttribute(valueAttr);
+      if (!defaultValue.isNull())
+        m_inputType->warnIfValueIsInvalid(defaultValue);
+    }
+
+    if (newValueMode == ValueMode::kValue) {
+      String newValue = sanitizeValue(m_valueIfDirty);
+      if (!equalIgnoringNullity(newValue, m_valueIfDirty)) {
+        if (hasDirtyValue())
+          setValue(newValue);
+        else
+          setNonDirtyValue(newValue);
+      }
+    }
   }
 
   m_needsToUpdateViewValue = true;
   m_inputTypeView->updateView();
 
   if (didRespectHeightAndWidth !=
       m_inputType->shouldRespectHeightAndWidthAttributes()) {
     DCHECK(elementData());
     AttributeCollection attributes = attributesWithoutUpdate();
     if (const Attribute* height = attributes.find(heightAttr))
@@ skipping 223 matching lines @@
         m_autocomplete = Uninitialized;
       else
         m_autocomplete = On;
     }
   } else if (name == typeAttr) {
     updateType();
   } else if (name == valueAttr) {
     // We only need to setChanged if the form is looking at the default value
     // right now.
     if (!hasDirtyValue()) {
+      if (m_inputType->valueMode() == ValueMode::kValue) {
+        m_valueIfDirty = sanitizeValue(value);
+        setTextAsOfLastFormControlChangeEvent(m_valueIfDirty);
+      }
       updatePlaceholderVisibility();
       setNeedsStyleRecalc(
           SubtreeStyleChange,
           StyleChangeReasonForTracing::fromAttribute(valueAttr));
-      if (m_inputType->valueMode() == ValueMode::kValue)
-        setTextAsOfLastFormControlChangeEvent(sanitizeValue(value));
     }
     m_needsToUpdateViewValue = true;
     setNeedsValidityCheck();
     m_valueAttributeWasUpdatedAfterParsing = !m_parsingInProgress;
     m_inputType->warnIfValueIsInvalidAndElementIsVisible(value);
     m_inputTypeView->valueAttributeChanged();
   } else if (name == checkedAttr) {
     // Another radio button in the same group might be checked by state
     // restore. We shouldn't call setChecked() even if this has the checked
     // attribute. So, delay the setChecked() call until
@@ skipping 148 matching lines @@
 void HTMLInputElement::appendToFormData(FormData& formData) {
   if (m_inputType->isFormDataAppendable())
     m_inputType->appendToFormData(formData);
 }
 
 String HTMLInputElement::resultForDialogSubmit() {
   return m_inputType->resultForDialogSubmit();
 }
 
 void HTMLInputElement::resetImpl() {
-  if (m_inputType->valueMode() == ValueMode::kValue ||
-      m_inputType->valueMode() == ValueMode::kFilename) {
-    setValue(String());
+  if (m_inputType->valueMode() == ValueMode::kValue) {
+    setNonDirtyValue(defaultValue());
+    setNeedsValidityCheck();
+  } else if (m_inputType->valueMode() == ValueMode::kFilename) {
+    setNonDirtyValue(String());
     setNeedsValidityCheck();
   }
 
   setChecked(hasAttribute(checkedAttr));
   m_dirtyCheckedness = false;
 }
 
 bool HTMLInputElement::isTextField() const {
   return m_inputType->isTextField();
 }
@@ skipping 82 matching lines @@
   m_isIndeterminate = sourceElement.m_isIndeterminate;
   m_inputType->copyNonAttributeProperties(sourceElement);
 
   HTMLTextFormControlElement::copyNonAttributePropertiesFromElement(source);
 
   m_needsToUpdateViewValue = true;
   m_inputTypeView->updateView();
 }
 
 String HTMLInputElement::value() const {
-  String value;
-  if (m_inputType->getTypeSpecificValue(value))
-    return value;
-
-  if (hasDirtyValue())
-    return m_valueIfDirty;
-
-  AtomicString valueString = fastGetAttribute(valueAttr);
-  value = sanitizeValue(valueString);
-  if (!value.isNull())
-    return value;
-
-  return m_inputType->fallbackValue();
+  switch (m_inputType->valueMode()) {
+    case ValueMode::kFilename: {
+      String value;
+      // TODO(tkent): The bool return value of getTypeSpecificValue() doesn't
+      // make sense. FileInputType::getTypeSpecificValue() always returns true.
+      bool result = m_inputType->getTypeSpecificValue(value);
+      DCHECK(result);
+      return value;
+    }
+    case ValueMode::kDefault:
+      return fastGetAttribute(valueAttr);
+    case ValueMode::kDefaultOn: {
+      AtomicString valueString = fastGetAttribute(valueAttr);
+      return valueString.isNull() ? "on" : valueString;
+    }
+    case ValueMode::kValue:
+      return m_valueIfDirty;
+  }
+  NOTREACHED();
+  return emptyString();
 }
 
 String HTMLInputElement::valueWithDefault() const {
   String value = this->value();
   if (!value.isNull())
     return value;
 
   return m_inputType->defaultValue();
 }
 
@@ skipping 58 matching lines @@
 
   setLastChangeWasNotUserEdit();
   m_needsToUpdateViewValue = true;
   // Prevent TextFieldInputType::setValue from using the suggested value.
   m_suggestedValue = String();
 
   m_inputType->setValue(sanitizedValue, valueChanged, eventBehavior);
   m_inputTypeView->didSetValue(sanitizedValue, valueChanged);
 
   if (valueChanged && eventBehavior == DispatchNoEvent)
-    setTextAsOfLastFormControlChangeEvent(
-        sanitizedValue.isNull() ? defaultValue() : sanitizedValue);
+    setTextAsOfLastFormControlChangeEvent(this->value());
 
   if (!valueChanged)
     return;
 
   notifyFormStateChanged();
 }
 
 void HTMLInputElement::setNonAttributeValue(const String& sanitizedValue) {
   // This is a common code for ValueMode::kValue.
   DCHECK_EQ(m_inputType->valueMode(), ValueMode::kValue);
   m_valueIfDirty = sanitizedValue;
-  m_hasDirtyValue = !m_valueIfDirty.isNull();
+  m_hasDirtyValue = true;
   setNeedsValidityCheck();
   if (m_inputType->isSteppable()) {
     pseudoStateChanged(CSSSelector::PseudoInRange);
     pseudoStateChanged(CSSSelector::PseudoOutOfRange);
   }
   if (document().focusedElement() == this)
     document()
         .frameHost()
         ->chromeClient()
         .didUpdateTextOfFocusedElementByNonUserInput(*document().frame());
 }
 
+void HTMLInputElement::setNonDirtyValue(const String& newValue) {
+  setValue(newValue);
+  m_hasDirtyValue = false;
+}
+
 bool HTMLInputElement::hasDirtyValue() const {
-  DCHECK_EQ(!m_hasDirtyValue, m_valueIfDirty.isNull());
   return m_hasDirtyValue;
 }
 
 void HTMLInputElement::updateView() {
   m_inputTypeView->updateView();
 }
 
 double HTMLInputElement::valueAsDate(bool& isNull) const {
   double date = m_inputType->valueAsDate();
   isNull = !std::isfinite(date);
@@ skipping 328 matching lines @@
 
 void HTMLInputElement::setCanReceiveDroppedFiles(bool canReceiveDroppedFiles) {
   if (!!m_canReceiveDroppedFiles == canReceiveDroppedFiles)
     return;
   m_canReceiveDroppedFiles = canReceiveDroppedFiles;
   if (layoutObject())
     layoutObject()->updateFromElement();
 }
 
 String HTMLInputElement::sanitizeValue(const String& proposedValue) const {
-  if (proposedValue.isNull())
-    return proposedValue;
   return m_inputType->sanitizeValue(proposedValue);
 }
 
 String HTMLInputElement::localizeValue(const String& proposedValue) const {
   if (proposedValue.isNull())
     return proposedValue;
   return m_inputType->localizeValue(proposedValue);
 }
 
 bool HTMLInputElement::isInRange() const {
@@ skipping 458 matching lines @@
 
 bool HTMLInputElement::hasFallbackContent() const {
   return m_inputTypeView->hasFallbackContent();
 }
 
 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) {
   return m_inputType->setFilesFromPaths(paths);
 }
 
 }  // namespace blink