Changeset 124171 in webkit


Ignore:
Timestamp:
Jul 30, 2012 9:19:30 PM (12 years ago)
Author:
yosin@chromium.org
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().

Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r124168 r124171  
     12012-07-30  Yoshifumi Inoue  <yosin@chromium.org>
     2
     3        [CSS] Change Element::isReadOnlyFormControl to shouldMatchReadWriteSelector or HTMLTextFormControlElement::readOnly
     4        https://bugs.webkit.org/show_bug.cgi?id=92602
     5
     6        Reviewed by Kent Tamura.
     7
     8        This patch renames Element::isReadOnlyFormControl() to Element::shouldMatchReadWriteSelector()
     9        or HTMLTextFormControlElement::readOnly() to make intention of
     10        shouldMatchReadWriteSelector(was isReadOnlyFormControl) self descriptive.
     11
     12        No new tests. This patch doesn't change behavior.
     13
     14        * css/SelectorChecker.cpp:
     15        (WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
     16        * dom/Element.cpp:
     17        (WebCore::Element::shouldMatchReadWriteSelector): Added default implementation.
     18        * dom/Element.h:
     19        (WebCore::Element::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
     20        * html/HTMLFormControlElement.h:
     21        * html/shadow/SliderThumbElement.cpp:
     22        (WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
     23        (WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
     24        (WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
     25        * html/shadow/SliderThumbElement.h:
     26        (SliderThumbElement): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
     27        * html/shadow/TextControlInnerElements.cpp:
     28        (WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
     29        (WebCore::SpinButtonElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
     30        (WebCore::SpinButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
     31        (WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
     32        * html/shadow/TextControlInnerElements.h:
     33        * rendering/RenderTheme.cpp:
     34        (WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyFormControl() by shouldMatchReadWriteSelector().
     35
    1362012-07-30  Julien Chaffraix  <jchaffraix@webkit.org>
    237

  • trunk/Source/WebCore/css/SelectorChecker.cpp

    r123636 r124171  
    10671067            if (!element || !element->isFormControlElement())
    10681068                return false;
    1069             return element->isTextFormControl() && element->isReadOnlyFormControl();
     1069            return element->isTextFormControl() && !element->shouldMatchReadWriteSelector();
    10701070        case CSSSelector::PseudoReadWrite:
    10711071            if (!element || !element->isFormControlElement())
    10721072                return false;
    1073             return element->isTextFormControl() && !element->isReadOnlyFormControl();
     1073            return element->isTextFormControl() && element->shouldMatchReadWriteSelector();
    10741074        case CSSSelector::PseudoOptional:
    10751075            return element && element->isOptionalFormControl();

  • trunk/Source/WebCore/dom/Element.cpp

    r123944 r124171  
    17841784}
    17851785
     1786
     1787bool Element::shouldMatchReadWriteSelector() const
     1788{
     1789    return false;
     1790}
     1791
    17861792bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
    17871793{

  • trunk/Source/WebCore/dom/Element.h

    r123944 r124171  
    351351    unsigned childElementCount() const;
    352352
     353    virtual bool shouldMatchReadWriteSelector() const;
    353354    bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
    354355
    … …  
    374375    virtual bool isFormControlElement() const { return false; }
    375376    virtual bool isEnabledFormControl() const { return true; }
    376     virtual bool isReadOnlyFormControl() const { return false; }
    377377    virtual bool isSpinButtonElement() const { return false; }
    378378    virtual bool isTextFormControl() const { return false; }

  • trunk/Source/WebCore/html/HTMLFormControlElement.h

    r123713 r124171  
    8282    virtual const AtomicString& formControlType() const OVERRIDE = 0;
    8383    virtual bool isEnabledFormControl() const { return !disabled(); }
    84     virtual bool isReadOnlyFormControl() const { return readOnly(); }
     84    virtual bool shouldMatchReadWriteSelector() const OVERRIDE { return !readOnly(); }
    8585
    8686    virtual bool canTriggerImplicitSubmission() const { return false; }

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r124146 r124171  
    215215}
    216216
    217 bool SliderThumbElement::isReadOnlyFormControl() const
    218 {
    219     return hostInput()->isReadOnlyFormControl();
     217bool SliderThumbElement::shouldMatchReadWriteSelector() const
     218{
     219    return hostInput()->shouldMatchReadWriteSelector();
    220220}
    221221
    … …  
    335335{
    336336    const HTMLInputElement* input = hostInput();
    337     if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl() && m_inDragMode)
     337    if (input && !input->readOnly() && input->isEnabledFormControl() && m_inDragMode)
    338338        return true;
    339339
    … …  
    344344{
    345345    const HTMLInputElement* input = hostInput();
    346     if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl())
     346    if (input && !input->readOnly() && input->isEnabledFormControl())
    347347        return true;
    348348

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.h

    r124022 r124171  
    6767    virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren();
    6868    virtual bool isEnabledFormControl() const;
    69     virtual bool isReadOnlyFormControl() const;
     69    virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
    7070    virtual Node* focusDelegate();
    7171    void startDragging();

  • trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

    r124146 r124171  
    243243{
    244244    const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
    245     if (!input->disabled() && !input->isReadOnlyFormControl())
     245    if (!input->disabled() && !input->readOnly())
    246246        return true;
    247247
    … …  
    346346{
    347347    const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
    348     if (renderBox() && !input->disabled() && !input->isReadOnlyFormControl())
     348    if (renderBox() && !input->disabled() && !input->readOnly())
    349349        return true;
    350350
    … …  
    355355{
    356356    const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
    357     if (renderBox() && !input->disabled() && !input->isReadOnlyFormControl())
     357    if (renderBox() && !input->disabled() && !input->readOnly())
    358358        return true;
    359359
    … …  
    515515{
    516516    const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
    517     if (!input->disabled() && !input->isReadOnlyFormControl())
     517    if (!input->disabled() && !input->readOnly())
    518518        return true;
    519519

  • trunk/Source/WebCore/html/shadow/TextControlInnerElements.h

    r124022 r124171  
    126126    virtual bool isSpinButtonElement() const { return true; }
    127127    virtual bool isEnabledFormControl() const { return shadowHost()->isEnabledFormControl(); }
    128     virtual bool isReadOnlyFormControl() const { return shadowHost()->isReadOnlyFormControl(); }
     128    virtual bool shouldMatchReadWriteSelector() const OVERRIDE { return shadowHost()->shouldMatchReadWriteSelector(); }
    129129    virtual void defaultEventHandler(Event*);
    130130    void doStepAction(int);

  • trunk/Source/WebCore/rendering/RenderTheme.cpp

    r123969 r124171  
    829829    if (!node || !node->isElementNode())
    830830        return false;
    831     return static_cast<Element*>(node)->isReadOnlyFormControl();
     831    return !static_cast<Element*>(node)->shouldMatchReadWriteSelector();
    832832}
    833833
Note: See TracChangeset for help on using the changeset viewer.