Diff
Modified: trunk/Source/WebCore/ChangeLog (136924 => 136925)
--- trunk/Source/WebCore/ChangeLog 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/ChangeLog 2012-12-07 07:21:14 UTC (rev 136925)
@@ -1,3 +1,44 @@
+2012-12-06 Kent Tamura <[email protected]>
+
+ Refactoring: Rename HTMLFormControlElement::required to isRequired
+ https://bugs.webkit.org/show_bug.cgi?id=104336
+
+ Reviewed by Kentaro Hara.
+
+ m_required should be m_isRequired, and required() should be
+ isRequired. It's safe to rename them because HTML*Element::required IDL
+ attributes are [Reflected].
+ http://www.webkit.org/coding/coding-style.html#names-bool
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isRequired):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::canShareStyleWithControl):
+ * dom/CheckedRadioButtons.cpp:
+ (WebCore::RadioButtonGroup::add):
+ (WebCore::RadioButtonGroup::requiredAttributeChanged):
+ (WebCore::RadioButtonGroup::remove):
+ * html/CheckboxInputType.cpp:
+ (WebCore::CheckboxInputType::valueMissing):
+ * html/FileInputType.cpp:
+ (WebCore::FileInputType::valueMissing):
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::HTMLFormControlElement):
+ (WebCore::HTMLFormControlElement::parseAttribute):
+ (WebCore::HTMLFormControlElement::isRequired):
+ * html/HTMLFormControlElement.h:
+ (HTMLFormControlElement):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::isRequiredFormControl):
+ (WebCore::HTMLInputElement::setupDateTimeChooserParameters):
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::valueMissing):
+ (WebCore::HTMLSelectElement::isRequiredFormControl):
+ * html/HTMLTextAreaElement.h:
+ (WebCore::HTMLTextAreaElement::isRequiredFormControl):
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::valueMissing):
+
2012-12-06 Hajime Morrita <[email protected]>
[Shadow DOM] Implement Element::shadowRoot with prefix
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (136924 => 136925)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -686,7 +686,7 @@
Node* n = this->node();
if (n && (n->isElementNode() && toElement(n)->isFormControlElement()))
- return static_cast<HTMLFormControlElement*>(n)->required();
+ return static_cast<HTMLFormControlElement*>(n)->isRequired();
return false;
}
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (136924 => 136925)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -1092,7 +1092,7 @@
return false;
if (thisInputElement->isIndeterminate() != otherInputElement->isIndeterminate())
return false;
- if (thisInputElement->required() != otherInputElement->required())
+ if (thisInputElement->isRequired() != otherInputElement->isRequired())
return false;
if (element->isEnabledFormControl() != m_element->isEnabledFormControl())
Modified: trunk/Source/WebCore/dom/CheckedRadioButtons.cpp (136924 => 136925)
--- trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/dom/CheckedRadioButtons.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -81,7 +81,7 @@
if (!m_members.add(button).isNewEntry)
return;
bool groupWasValid = isValid();
- if (button->required())
+ if (button->isRequired())
++m_requiredCount;
if (button->checked())
setCheckedButton(button);
@@ -116,7 +116,7 @@
ASSERT(button->isRadioButton());
ASSERT(m_members.contains(button));
bool wasValid = isValid();
- if (button->required())
+ if (button->isRequired())
++m_requiredCount;
else {
ASSERT(m_requiredCount);
@@ -134,7 +134,7 @@
return;
bool wasValid = isValid();
m_members.remove(it);
- if (button->required()) {
+ if (button->isRequired()) {
ASSERT(m_requiredCount);
--m_requiredCount;
}
Modified: trunk/Source/WebCore/html/CheckboxInputType.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/CheckboxInputType.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/CheckboxInputType.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -52,7 +52,7 @@
bool CheckboxInputType::valueMissing(const String&) const
{
- return element()->required() && !element()->checked();
+ return element()->isRequired() && !element()->checked();
}
String CheckboxInputType::valueMissingText() const
Modified: trunk/Source/WebCore/html/FileInputType.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/FileInputType.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/FileInputType.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -165,7 +165,7 @@
bool FileInputType::valueMissing(const String& value) const
{
- return element()->required() && value.isEmpty();
+ return element()->isRequired() && value.isEmpty();
}
String FileInputType::valueMissingText() const
Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -51,7 +51,7 @@
: LabelableElement(tagName, document)
, m_disabled(false)
, m_readOnly(false)
- , m_required(false)
+ , m_isRequired(false)
, m_valueMatchesRenderer(false)
, m_ancestorDisabledState(AncestorDisabledStateUnknown)
, m_dataListAncestorState(Unknown)
@@ -139,9 +139,9 @@
renderer()->theme()->stateChanged(renderer(), ReadOnlyState);
}
} else if (name == requiredAttr) {
- bool oldRequired = m_required;
- m_required = !value.isNull();
- if (oldRequired != m_required)
+ bool wasRequired = m_isRequired;
+ m_isRequired = !value.isNull();
+ if (wasRequired != m_isRequired)
requiredAttributeChanged();
} else
HTMLElement::parseAttribute(name, value);
@@ -288,9 +288,9 @@
return hasAttribute(autofocusAttr);
}
-bool HTMLFormControlElement::required() const
+bool HTMLFormControlElement::isRequired() const
{
- return m_required;
+ return m_isRequired;
}
static void updateFromElementCallback(Node* node, unsigned)
Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (136924 => 136925)
--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-12-07 07:21:14 UTC (rev 136925)
@@ -75,7 +75,7 @@
// Determines whether or not a control will be automatically focused.
virtual bool autofocus() const;
- bool required() const;
+ bool isRequired() const;
const AtomicString& type() const { return formControlType(); }
@@ -153,7 +153,7 @@
OwnPtr<ValidationMessage> m_validationMessage;
bool m_disabled : 1;
bool m_readOnly : 1;
- bool m_required : 1;
+ bool m_isRequired : 1;
bool m_valueMatchesRenderer : 1;
enum AncestorDisabledState { AncestorDisabledStateUnknown, AncestorDisabledStateEnabled, AncestorDisabledStateDisabled };
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -1433,7 +1433,7 @@
bool HTMLInputElement::isRequiredFormControl() const
{
- return m_inputType->supportsRequired() && required();
+ return m_inputType->supportsRequired() && isRequired();
}
bool HTMLInputElement::shouldMatchReadOnlySelector() const
@@ -1888,7 +1888,7 @@
parameters.type = type();
parameters.minimum = minimum();
parameters.maximum = maximum();
- parameters.required = required();
+ parameters.required = isRequired();
if (!RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
parameters.locale = defaultLanguage();
else {
Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -160,7 +160,7 @@
if (!willValidate())
return false;
- if (!isRequiredFormControl())
+ if (!isRequired())
return false;
int firstSelectionIndex = selectedIndex();
@@ -484,7 +484,7 @@
bool HTMLSelectElement::isRequiredFormControl() const
{
- return required();
+ return isRequired();
}
// Returns the 1st valid item |skip| items from |listIndex| in direction |direction| if there is one.
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.h (136924 => 136925)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.h 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.h 2012-12-07 07:21:14 UTC (rev 136925)
@@ -80,7 +80,7 @@
virtual bool isEmptyValue() const { return value().isEmpty(); }
virtual bool isOptionalFormControl() const { return !isRequiredFormControl(); }
- virtual bool isRequiredFormControl() const { return required(); }
+ virtual bool isRequiredFormControl() const { return isRequired(); }
virtual void defaultEventHandler(Event*);
Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (136924 => 136925)
--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-12-07 07:20:18 UTC (rev 136924)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2012-12-07 07:21:14 UTC (rev 136925)
@@ -85,7 +85,7 @@
bool TextFieldInputType::valueMissing(const String& value) const
{
- return element()->required() && value.isEmpty();
+ return element()->isRequired() && value.isEmpty();
}
bool TextFieldInputType::canSetSuggestedValue()
