- Revision
- 124171
- Author
- [email protected]
- Date
- 2012-07-30 21:19:30 -0700 (Mon, 30 Jul 2012)
Log Message
[CSS] Change Element::isReadOnlyFormControl to shouldMatchReadWriteSelector or HTMLTextFormControlElement::readOnly
https://bugs.webkit.org/show_bug.cgi?id=92602
Reviewed by Kent Tamura.
This patch renames Element::isReadOnlyFormControl() to Element::shouldMatchReadWriteSelector()
or HTMLTextFormControlElement::readOnly() to make intention of
shouldMatchReadWriteSelector(was isReadOnlyFormControl) self descriptive.
No new tests. This patch doesn't change behavior.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
* dom/Element.cpp:
(WebCore::Element::shouldMatchReadWriteSelector): Added default implementation.
* dom/Element.h:
(WebCore::Element::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
* html/HTMLFormControlElement.h:
* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
(WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
* html/shadow/SliderThumbElement.h:
(SliderThumbElement): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
* html/shadow/TextControlInnerElements.cpp:
(WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::SpinButtonElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::SpinButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
* html/shadow/TextControlInnerElements.h:
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124170 => 124171)
--- trunk/Source/WebCore/ChangeLog 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 04:19:30 UTC (rev 124171)
@@ -1,3 +1,38 @@
+2012-07-30 Yoshifumi Inoue <[email protected]>
+
+ [CSS] Change Element::isReadOnlyFormControl to shouldMatchReadWriteSelector or HTMLTextFormControlElement::readOnly
+ https://bugs.webkit.org/show_bug.cgi?id=92602
+
+ Reviewed by Kent Tamura.
+
+ This patch renames Element::isReadOnlyFormControl() to Element::shouldMatchReadWriteSelector()
+ or HTMLTextFormControlElement::readOnly() to make intention of
+ shouldMatchReadWriteSelector(was isReadOnlyFormControl) self descriptive.
+
+ No new tests. This patch doesn't change behavior.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
+ * dom/Element.cpp:
+ (WebCore::Element::shouldMatchReadWriteSelector): Added default implementation.
+ * dom/Element.h:
+ (WebCore::Element::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
+ * html/HTMLFormControlElement.h:
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
+ (WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
+ * html/shadow/SliderThumbElement.h:
+ (SliderThumbElement): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::SpinButtonElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::SpinButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
+ * html/shadow/TextControlInnerElements.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
+
2012-07-30 Julien Chaffraix <[email protected]>
Remove overflow: scroll handling in block flow layout methods
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (124170 => 124171)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2012-07-31 04:19:30 UTC (rev 124171)
@@ -1066,11 +1066,11 @@
case CSSSelector::PseudoReadOnly:
if (!element || !element->isFormControlElement())
return false;
- return element->isTextFormControl() && element->isReadOnlyFormControl();
+ return element->isTextFormControl() && !element->shouldMatchReadWriteSelector();
case CSSSelector::PseudoReadWrite:
if (!element || !element->isFormControlElement())
return false;
- return element->isTextFormControl() && !element->isReadOnlyFormControl();
+ return element->isTextFormControl() && element->shouldMatchReadWriteSelector();
case CSSSelector::PseudoOptional:
return element && element->isOptionalFormControl();
case CSSSelector::PseudoRequired:
Modified: trunk/Source/WebCore/dom/Element.cpp (124170 => 124171)
--- trunk/Source/WebCore/dom/Element.cpp 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-07-31 04:19:30 UTC (rev 124171)
@@ -1783,6 +1783,12 @@
return count;
}
+
+bool Element::shouldMatchReadWriteSelector() const
+{
+ return false;
+}
+
bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
{
if (selector.isEmpty()) {
Modified: trunk/Source/WebCore/dom/Element.h (124170 => 124171)
--- trunk/Source/WebCore/dom/Element.h 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/dom/Element.h 2012-07-31 04:19:30 UTC (rev 124171)
@@ -350,6 +350,7 @@
Element* nextElementSibling() const;
unsigned childElementCount() const;
+ virtual bool shouldMatchReadWriteSelector() const;
bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
DOMTokenList* classList();
@@ -373,7 +374,6 @@
virtual bool isFormControlElement() const { return false; }
virtual bool isEnabledFormControl() const { return true; }
- virtual bool isReadOnlyFormControl() const { return false; }
virtual bool isSpinButtonElement() const { return false; }
virtual bool isTextFormControl() const { return false; }
virtual bool isOptionalFormControl() const { return false; }
Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (124170 => 124171)
--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-07-31 04:19:30 UTC (rev 124171)
@@ -81,7 +81,7 @@
virtual const AtomicString& formControlType() const OVERRIDE = 0;
virtual bool isEnabledFormControl() const { return !disabled(); }
- virtual bool isReadOnlyFormControl() const { return readOnly(); }
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE { return !readOnly(); }
virtual bool canTriggerImplicitSubmission() const { return false; }
Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (124170 => 124171)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-31 04:19:30 UTC (rev 124171)
@@ -214,9 +214,9 @@
return hostInput()->isEnabledFormControl();
}
-bool SliderThumbElement::isReadOnlyFormControl() const
+bool SliderThumbElement::shouldMatchReadWriteSelector() const
{
- return hostInput()->isReadOnlyFormControl();
+ return hostInput()->shouldMatchReadWriteSelector();
}
Node* SliderThumbElement::focusDelegate()
@@ -334,7 +334,7 @@
bool SliderThumbElement::willRespondToMouseMoveEvents()
{
const HTMLInputElement* input = hostInput();
- if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl() && m_inDragMode)
+ if (input && !input->readOnly() && input->isEnabledFormControl() && m_inDragMode)
return true;
return HTMLDivElement::willRespondToMouseMoveEvents();
@@ -343,7 +343,7 @@
bool SliderThumbElement::willRespondToMouseClickEvents()
{
const HTMLInputElement* input = hostInput();
- if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl())
+ if (input && !input->readOnly() && input->isEnabledFormControl())
return true;
return HTMLDivElement::willRespondToMouseClickEvents();
Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.h (124170 => 124171)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2012-07-31 04:19:30 UTC (rev 124171)
@@ -66,7 +66,7 @@
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren();
virtual bool isEnabledFormControl() const;
- virtual bool isReadOnlyFormControl() const;
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
virtual Node* focusDelegate();
void startDragging();
void stopDragging();
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (124170 => 124171)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-07-31 04:19:30 UTC (rev 124171)
@@ -242,7 +242,7 @@
bool SearchFieldCancelButtonElement::willRespondToMouseClickEvents()
{
const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
- if (!input->disabled() && !input->isReadOnlyFormControl())
+ if (!input->disabled() && !input->readOnly())
return true;
return HTMLDivElement::willRespondToMouseClickEvents();
@@ -345,7 +345,7 @@
bool SpinButtonElement::willRespondToMouseMoveEvents()
{
const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
- if (renderBox() && !input->disabled() && !input->isReadOnlyFormControl())
+ if (renderBox() && !input->disabled() && !input->readOnly())
return true;
return HTMLDivElement::willRespondToMouseMoveEvents();
@@ -354,7 +354,7 @@
bool SpinButtonElement::willRespondToMouseClickEvents()
{
const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
- if (renderBox() && !input->disabled() && !input->isReadOnlyFormControl())
+ if (renderBox() && !input->disabled() && !input->readOnly())
return true;
return HTMLDivElement::willRespondToMouseClickEvents();
@@ -514,7 +514,7 @@
bool InputFieldSpeechButtonElement::willRespondToMouseClickEvents()
{
const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
- if (!input->disabled() && !input->isReadOnlyFormControl())
+ if (!input->disabled() && !input->readOnly())
return true;
return HTMLDivElement::willRespondToMouseClickEvents();
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (124170 => 124171)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2012-07-31 04:19:30 UTC (rev 124171)
@@ -125,7 +125,7 @@
virtual void detach();
virtual bool isSpinButtonElement() const { return true; }
virtual bool isEnabledFormControl() const { return shadowHost()->isEnabledFormControl(); }
- virtual bool isReadOnlyFormControl() const { return shadowHost()->isReadOnlyFormControl(); }
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE { return shadowHost()->shouldMatchReadWriteSelector(); }
virtual void defaultEventHandler(Event*);
void doStepAction(int);
void startRepeatingTimer();
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (124170 => 124171)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-07-31 03:49:06 UTC (rev 124170)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-07-31 04:19:30 UTC (rev 124171)
@@ -828,7 +828,7 @@
Node* node = o->node();
if (!node || !node->isElementNode())
return false;
- return static_cast<Element*>(node)->isReadOnlyFormControl();
+ return !static_cast<Element*>(node)->shouldMatchReadWriteSelector();
}
bool RenderTheme::isHovered(const RenderObject* o) const
