- Revision
- 124180
- Author
- [email protected]
- Date
- 2012-07-31 00:58:47 -0700 (Tue, 31 Jul 2012)
Log Message
Change Element::isReadOnlyFormControl to Element::shouldMatchReadOnlySelector/shouldMatchReadWriteSelector or HTMLFormControlElement::readOnly
https://bugs.webkit.org/show_bug.cgi?id=92602
Reviewed by Kent Tamura.
This patch replaces Element::isReadOnlyFormControl() by
Element::shouldMatchReadOnlySelector/shouldMatchReadOnlySelector or
HTMLFormControlElement::readOnly() to make intention of functions
self descriptive.
No new tests. This patch doesn't change behavior.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class, and replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class.
* dom/Element.cpp:
(WebCore::Element::shouldMatchReadOnlySelector): Added for default implementation.
(WebCore::Element::shouldMatchReadWriteSelector): for default implementation.
* dom/Element.h:
(Element): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::shouldMatchReadOnlySelector): Added.
(WebCore::HTMLFormControlElement::shouldMatchReadWriteSelector): Added.
* html/HTMLFormControlElement.h:
(HTMLFormControlElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::shouldMatchReadOnlySelector): Added.
(WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Added.
(WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
(SliderThumbElement):
* html/shadow/TextControlInnerElements.cpp:
(WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
(WebCore::SpinButtonElement::willRespondToMouseMoveEvents): ditto.
(WebCore::SpinButtonElement::willRespondToMouseClickEvents): ditto.
(WebCore::SpinButtonElement::shouldMatchReadOnlySelector): Added.
(WebCore::SpinButtonElement::shouldMatchReadWriteSelector): Added.
(WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
* html/shadow/TextControlInnerElements.h:
(SpinButtonElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyControl() by shouldMatchReadOnlySelector().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124179 => 124180)
--- trunk/Source/WebCore/ChangeLog 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 07:58:47 UTC (rev 124180)
@@ -1,3 +1,47 @@
+2012-07-31 Yoshifumi Inoue <[email protected]>
+
+ Change Element::isReadOnlyFormControl to Element::shouldMatchReadOnlySelector/shouldMatchReadWriteSelector or HTMLFormControlElement::readOnly
+ https://bugs.webkit.org/show_bug.cgi?id=92602
+
+ Reviewed by Kent Tamura.
+
+ This patch replaces Element::isReadOnlyFormControl() by
+ Element::shouldMatchReadOnlySelector/shouldMatchReadOnlySelector or
+ HTMLFormControlElement::readOnly() to make intention of functions
+ self descriptive.
+
+ No new tests. This patch doesn't change behavior.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class, and replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class.
+ * dom/Element.cpp:
+ (WebCore::Element::shouldMatchReadOnlySelector): Added for default implementation.
+ (WebCore::Element::shouldMatchReadWriteSelector): for default implementation.
+ * dom/Element.h:
+ (Element): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::shouldMatchReadOnlySelector): Added.
+ (WebCore::HTMLFormControlElement::shouldMatchReadWriteSelector): Added.
+ * html/HTMLFormControlElement.h:
+ (HTMLFormControlElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::SliderThumbElement::shouldMatchReadOnlySelector): Added.
+ (WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Added.
+ (WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
+ (SliderThumbElement):
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
+ (WebCore::SpinButtonElement::willRespondToMouseMoveEvents): ditto.
+ (WebCore::SpinButtonElement::willRespondToMouseClickEvents): ditto.
+ (WebCore::SpinButtonElement::shouldMatchReadOnlySelector): Added.
+ (WebCore::SpinButtonElement::shouldMatchReadWriteSelector): Added.
+ (WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
+ * html/shadow/TextControlInnerElements.h:
+ (SpinButtonElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyControl() by shouldMatchReadOnlySelector().
+
2012-07-31 Xingnan Wang <[email protected]>
IndexedDB: Size the Vector in encodeInt/encodeVarInt/encodeString
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (124179 => 124180)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -1066,11 +1066,11 @@
case CSSSelector::PseudoReadOnly:
if (!element || !element->isFormControlElement())
return false;
- return element->isTextFormControl() && element->isReadOnlyFormControl();
+ return element->isTextFormControl() && element->shouldMatchReadOnlySelector();
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 (124179 => 124180)
--- trunk/Source/WebCore/dom/Element.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -1783,6 +1783,16 @@
return count;
}
+bool Element::shouldMatchReadOnlySelector() const
+{
+ return false;
+}
+
+bool Element::shouldMatchReadWriteSelector() const
+{
+ return false;
+}
+
bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
{
if (selector.isEmpty()) {
Modified: trunk/Source/WebCore/dom/Element.h (124179 => 124180)
--- trunk/Source/WebCore/dom/Element.h 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/dom/Element.h 2012-07-31 07:58:47 UTC (rev 124180)
@@ -350,6 +350,8 @@
Element* nextElementSibling() const;
unsigned childElementCount() const;
+ virtual bool shouldMatchReadOnlySelector() const;
+ virtual bool shouldMatchReadWriteSelector() const;
bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
DOMTokenList* classList();
@@ -373,7 +375,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.cpp (124179 => 124180)
--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -482,6 +482,16 @@
setNeedsValidityCheck();
}
+bool HTMLFormControlElement::shouldMatchReadOnlySelector() const
+{
+ return readOnly();
+}
+
+bool HTMLFormControlElement::shouldMatchReadWriteSelector() const
+{
+ return !readOnly();
+}
+
bool HTMLFormControlElement::validationMessageShadowTreeContains(Node* node) const
{
return m_validationMessage && m_validationMessage->shadowTreeContains(node);
Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (124179 => 124180)
--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2012-07-31 07:58:47 UTC (rev 124180)
@@ -81,7 +81,8 @@
virtual const AtomicString& formControlType() const OVERRIDE = 0;
virtual bool isEnabledFormControl() const { return !disabled(); }
- virtual bool isReadOnlyFormControl() const { return readOnly(); }
+ virtual bool shouldMatchReadOnlySelector() const OVERRIDE;
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
virtual bool canTriggerImplicitSubmission() const { return false; }
Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (124179 => 124180)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -214,11 +214,16 @@
return hostInput()->isEnabledFormControl();
}
-bool SliderThumbElement::isReadOnlyFormControl() const
+bool SliderThumbElement::shouldMatchReadOnlySelector() const
{
- return hostInput()->isReadOnlyFormControl();
+ return hostInput()->shouldMatchReadOnlySelector();
}
+bool SliderThumbElement::shouldMatchReadWriteSelector() const
+{
+ return hostInput()->shouldMatchReadWriteSelector();
+}
+
Node* SliderThumbElement::focusDelegate()
{
return hostInput();
@@ -334,7 +339,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 +348,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 (124179 => 124180)
--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2012-07-31 07:58:47 UTC (rev 124180)
@@ -66,7 +66,8 @@
virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren();
virtual bool isEnabledFormControl() const;
- virtual bool isReadOnlyFormControl() const;
+ virtual bool shouldMatchReadOnlySelector() const OVERRIDE;
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
virtual Node* focusDelegate();
void startDragging();
void stopDragging();
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (124179 => 124180)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -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();
@@ -382,6 +382,16 @@
}
}
+bool SpinButtonElement::shouldMatchReadOnlySelector() const
+{
+ return shadowHost()->shouldMatchReadOnlySelector();
+}
+
+bool SpinButtonElement::shouldMatchReadWriteSelector() const
+{
+ return shadowHost()->shouldMatchReadWriteSelector();
+}
+
void SpinButtonElement::startRepeatingTimer()
{
m_pressStartingState = m_upDownState;
@@ -514,7 +524,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 (124179 => 124180)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2012-07-31 07:58:47 UTC (rev 124180)
@@ -125,7 +125,8 @@
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 shouldMatchReadOnlySelector() const OVERRIDE;
+ virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
virtual void defaultEventHandler(Event*);
void doStepAction(int);
void startRepeatingTimer();
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (124179 => 124180)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-07-31 07:12:23 UTC (rev 124179)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2012-07-31 07:58:47 UTC (rev 124180)
@@ -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)->shouldMatchReadOnlySelector();
}
bool RenderTheme::isHovered(const RenderObject* o) const
