Introduce enum InputType::ValueMode.

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 60 matching lines @@
 #include "core/layout/LayoutTheme.h"
 #include "core/page/ChromeClient.h"
 #include "platform/Language.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/text/PlatformLocale.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
+using ValueMode = InputType::ValueMode;
 using namespace HTMLNames;
 
 class ListAttributeTargetObserver : public IdTargetObserver {
  public:
   static ListAttributeTargetObserver* create(const AtomicString& id,
                                              HTMLInputElement*);
   DECLARE_VIRTUAL_TRACE();
   void idTargetChanged() override;
 
  private:
@@ skipping 317 matching lines @@
   DCHECK(m_inputTypeView);
 
   const AtomicString& newTypeName =
       InputType::normalizeTypeName(fastGetAttribute(typeAttr));
   if (m_inputType->formControlType() == newTypeName)
     return;
 
   InputType* newType = InputType::create(*this, newTypeName);
   removeFromRadioButtonGroup();
 
-  bool didStoreValue = m_inputType->storesValueSeparateFromAttribute();
+  bool didStoreValue = m_inputType->valueMode() == ValueMode::kValue ||
+                       m_inputType->valueMode() == ValueMode::kFilename;
   bool didRespectHeightAndWidth =
       m_inputType->shouldRespectHeightAndWidthAttributes();
   bool couldBeSuccessfulSubmitButton = canBeSuccessfulSubmitButton();
 
   m_inputTypeView->destroyShadowSubtree();
   lazyReattachIfAttached();
 
   m_inputType = newType;
   m_inputTypeView = m_inputType->createView();
   m_inputTypeView->createShadowSubtree();
 
   setNeedsWillValidateCheck();
 
-  bool willStoreValue = m_inputType->storesValueSeparateFromAttribute();
+  bool willStoreValue = m_inputType->valueMode() == ValueMode::kValue ||
+                        m_inputType->valueMode() == ValueMode::kFilename;
 
   // 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 (didStoreValue && !willStoreValue && hasDirtyValue()) {
     setAttribute(valueAttr, AtomicString(m_valueIfDirty));
@@ skipping 424 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->storesValueSeparateFromAttribute()) {
+  if (m_inputType->valueMode() == ValueMode::kValue ||
+      m_inputType->valueMode() == ValueMode::kFilename) {
     setValue(String());
     setNeedsValidityCheck();
   }
 
   setChecked(hasAttribute(checkedAttr));
   m_dirtyCheckedness = false;
 }
 
 bool HTMLInputElement::isTextField() const {
   return m_inputType->isTextField();
@@ skipping 1039 matching lines @@
 
 bool HTMLInputElement::hasFallbackContent() const {
   return m_inputTypeView->hasFallbackContent();
 }
 
 void HTMLInputElement::setFilesFromPaths(const Vector<String>& paths) {
   return m_inputType->setFilesFromPaths(paths);
 }
 
 }  // namespace blink