Remove HTMLFormControlElement::m_disabled, m_isReadOnly, and m_isRequired.

third_party/WebKit/Source/core/html/HTMLFormControlElement.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 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 31 matching lines @@
 #include "core/page/ValidationMessageClient.h"
 #include "platform/text/BidiTextRun.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
     : LabelableElement(tagName, document)
-    , m_disabled(false)
-    , m_isAutofilled(false)
-    , m_isReadOnly(false)
-    , m_isRequired(false)
-    , m_hasValidationMessage(false)
     , m_ancestorDisabledState(AncestorDisabledStateUnknown)
     , m_dataListAncestorState(Unknown)
+    , m_isAutofilled(false)
+    , m_hasValidationMessage(false)
     , m_willValidateInitialized(false)
     , m_willValidate(true)
     , m_isValid(true)
     , m_validityIsDirty(false)
     , m_wasChangedSinceLastFormControlChangeEvent(false)
     , m_wasFocusedByMouse(false)
 {
     setHasCustomStyleCallbacks();
     associateByParser(form);
 }
@@ skipping 87 matching lines @@
     setAutofilled(false);
     resetImpl();
 }
 
 void HTMLFormControlElement::parseAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& value)
 {
     if (name == formAttr) {
         formAttributeChanged();
         UseCounter::count(document(), UseCounter::FormAttribute);
     } else if (name == disabledAttr) {
-        bool oldDisabled = m_disabled;
-        m_disabled = !value.isNull();
-        if (oldDisabled != m_disabled)
+        if (oldValue.isNull() != value.isNull())
             disabledAttributeChanged();
     } else if (name == readonlyAttr) {
-        bool wasReadOnly = m_isReadOnly;
-        m_isReadOnly = !value.isNull();
-        if (wasReadOnly != m_isReadOnly) {
+        if (oldValue.isNull() != value.isNull()) {
             setNeedsWillValidateCheck();
             pseudoStateChanged(CSSSelector::PseudoReadOnly);
             pseudoStateChanged(CSSSelector::PseudoReadWrite);
             if (layoutObject())
                 LayoutTheme::theme().controlStateChanged(*layoutObject(), ReadOnlyControlState);
         }
     } else if (name == requiredAttr) {
-        bool wasRequired = m_isRequired;
-        m_isRequired = !value.isNull();
-        if (wasRequired != m_isRequired)
+        if (oldValue.isNull() != value.isNull())
             requiredAttributeChanged();
         UseCounter::count(document(), UseCounter::RequiredAttribute);
     } else if (name == autofocusAttr) {
         HTMLElement::parseAttribute(name, oldValue, value);
         UseCounter::count(document(), UseCounter::AutoFocusAttribute);
     } else {
         HTMLElement::parseAttribute(name, oldValue, value);
     }
 }
 
@@ skipping 11 matching lines @@
     }
 }
 
 void HTMLFormControlElement::requiredAttributeChanged()
 {
     setNeedsValidityCheck();
     pseudoStateChanged(CSSSelector::PseudoRequired);
     pseudoStateChanged(CSSSelector::PseudoOptional);
 }
 
+bool HTMLFormControlElement::isReadOnly() const
+{
+    return fastHasAttribute(HTMLNames::readonlyAttr);
+}
+
+bool HTMLFormControlElement::isDisabledOrReadOnly() const
+{
+    return isDisabledFormControl() || isReadOnly();
+}
+
 bool HTMLFormControlElement::supportsAutofocus() const
 {
     return false;
 }
 
 bool HTMLFormControlElement::isAutofocusable() const
 {
     return fastHasAttribute(autofocusAttr) && supportsAutofocus();
 }
 
@@ skipping 124 matching lines @@
     HTMLElement::dispatchInputEvent();
 }
 
 HTMLFormElement* HTMLFormControlElement::formOwner() const
 {
     return FormAssociatedElement::form();
 }
 
 bool HTMLFormControlElement::isDisabledFormControl() const
 {
-    if (m_disabled)
+    if (fastHasAttribute(disabledAttr))
         return true;
 
     if (m_ancestorDisabledState == AncestorDisabledStateUnknown)
         updateAncestorDisabledState();
     return m_ancestorDisabledState == AncestorDisabledStateDisabled;
 }
 
 bool HTMLFormControlElement::isRequired() const
 {
-    return m_isRequired;
+    return fastHasAttribute(requiredAttr);
 }
 
 String HTMLFormControlElement::resultForDialogSubmit()
 {
     return fastGetAttribute(valueAttr);
 }
 
 void HTMLFormControlElement::didRecalcStyle(StyleRecalcChange)
 {
     if (LayoutObject* layoutObject = this->layoutObject())
@@ skipping 283 matching lines @@
         dispatchFormControlChangeEvent();
 }
 
 void HTMLFormControlElement::copyNonAttributePropertiesFromElement(const Element& source)
 {
     HTMLElement::copyNonAttributePropertiesFromElement(source);
     setNeedsValidityCheck();
 }
 
 } // namespace blink