INPUT element: code cleanup

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 371 matching lines @@
   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);
+    m_nonAttributeValue = sanitizeValue(defaultValue);
   ensureUserAgentShadowRoot();
 
   setNeedsWillValidateCheck();
 
   if (!defaultValue.isNull())
     m_inputType->warnIfValueIsInvalid(defaultValue);
 
   m_inputTypeView->updateView();
   setTextAsOfLastFormControlChangeEvent(value());
   setChangedSinceLastFormControlChangeEvent(false);
@@ skipping 31 matching lines @@
   //
   // 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)) {
     if (hasDirtyValue())
-      setAttribute(valueAttr, AtomicString(m_valueIfDirty));
-    m_valueIfDirty = String();
+      setAttribute(valueAttr, AtomicString(m_nonAttributeValue));
+    m_nonAttributeValue = 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 = sanitizeValue(valueString);
+    m_nonAttributeValue = 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_nonAttributeValue = String();
     m_hasDirtyValue = false;
 
   } else {
     // 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)) {
+      String newValue = sanitizeValue(m_nonAttributeValue);
+      if (!equalIgnoringNullity(newValue, m_nonAttributeValue)) {
         if (hasDirtyValue())
           setValue(newValue);
         else
           setNonDirtyValue(newValue);
       }
     }
   }
 
   m_needsToUpdateViewValue = true;
   m_inputTypeView->updateView();
@@ skipping 230 matching lines @@
       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);
+        m_nonAttributeValue = sanitizeValue(value);
+        setTextAsOfLastFormControlChangeEvent(m_nonAttributeValue);
       }
       updatePlaceholderVisibility();
       setNeedsStyleRecalc(
           SubtreeStyleChange,
           StyleChangeReasonForTracing::fromAttribute(valueAttr));
     }
     m_needsToUpdateViewValue = true;
     setNeedsValidityCheck();
     m_valueAttributeWasUpdatedAfterParsing = !m_parsingInProgress;
     m_inputType->warnIfValueIsInvalidAndElementIsVisible(value);
@@ skipping 246 matching lines @@
 bool HTMLInputElement::sizeShouldIncludeDecoration(int& preferredSize) const {
   return m_inputTypeView->sizeShouldIncludeDecoration(defaultSize,
                                                       preferredSize);
 }
 
 void HTMLInputElement::copyNonAttributePropertiesFromElement(
     const Element& source) {
   const HTMLInputElement& sourceElement =
       static_cast<const HTMLInputElement&>(source);
 
-  m_valueIfDirty = sourceElement.m_valueIfDirty;
+  m_nonAttributeValue = sourceElement.m_nonAttributeValue;
   m_hasDirtyValue = sourceElement.m_hasDirtyValue;
   setChecked(sourceElement.m_isChecked);
   m_dirtyCheckedness = sourceElement.m_dirtyCheckedness;
   m_isIndeterminate = sourceElement.m_isIndeterminate;
   m_inputType->copyNonAttributeProperties(sourceElement);
 
   HTMLTextFormControlElement::copyNonAttributePropertiesFromElement(source);
 
   m_needsToUpdateViewValue = true;
   m_inputTypeView->updateView();
 }
 
 String HTMLInputElement::value() const {
   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::kFilename:
+      return m_inputType->valueInFilenameValueMode();
     case ValueMode::kDefault:
       return fastGetAttribute(valueAttr);
     case ValueMode::kDefaultOn: {
       AtomicString valueString = fastGetAttribute(valueAttr);
       return valueString.isNull() ? "on" : valueString;
     }
     case ValueMode::kValue:
-      return m_valueIfDirty;
+      return m_nonAttributeValue;
   }
   NOTREACHED();
   return emptyString();
 }
 
-String HTMLInputElement::valueWithDefault() const {
+String HTMLInputElement::valueOrDefaultLabel() const {
   String value = this->value();
   if (!value.isNull())
     return value;
-
-  return m_inputType->defaultValue();
+  return m_inputType->defaultLabel();
 }
 
 void HTMLInputElement::setValueForUser(const String& value) {
   // Call setValue and make it send a change event.
   setValue(value, DispatchChangeEvent);
 }
 
 const String& HTMLInputElement::suggestedValue() const {
   return m_suggestedValue;
 }
@@ skipping 61 matching lines @@
 
   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_nonAttributeValue = sanitizedValue;
   m_hasDirtyValue = true;
   setNeedsValidityCheck();
   if (m_inputType->isSteppable()) {
     pseudoStateChanged(CSSSelector::PseudoInRange);
     pseudoStateChanged(CSSSelector::PseudoOutOfRange);
   }
   if (document().focusedElement() == this)
     document()
         .frameHost()
         ->chromeClient()
@@ skipping 45 matching lines @@
   // File upload controls will never use this.
   DCHECK_NE(type(), InputTypeNames::file);
 
   m_suggestedValue = String();
 
   // Renderer and our event handler are responsible for sanitizing values.
   DCHECK(value == m_inputType->sanitizeUserInputValue(value) ||
          m_inputType->sanitizeUserInputValue(value).isEmpty());
 
   DCHECK(!value.isNull());
-  m_valueIfDirty = value;
+  m_nonAttributeValue = value;
   m_hasDirtyValue = true;
   m_needsToUpdateViewValue = false;
 
   // Input event is fired by the Node::defaultEventHandler for editable
   // controls.
   if (!isTextField())
     dispatchInputEvent();
   notifyFormStateChanged();
 
   setNeedsValidityCheck();
@@ skipping 759 matching lines @@
 
 bool HTMLInputElement::hasFallbackContent() const {
   return m_inputTypeView->hasFallbackContent();
 }
 
 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) {
   return m_inputType->setFilesFromPaths(paths);
 }
 
 }  // namespace blink