Changeset 124180 in webkit


Ignore:
Timestamp:
Jul 31, 2012 12:58:47 AM (12 years ago)
Author:
yosin@chromium.org
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().

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r124179 r124180  
     12012-07-31  Yoshifumi Inoue  <yosin@chromium.org>
     2
     3        Change Element::isReadOnlyFormControl to Element::shouldMatchReadOnlySelector/shouldMatchReadWriteSelector or HTMLFormControlElement::readOnly
     4        https://bugs.webkit.org/show_bug.cgi?id=92602
     5
     6        Reviewed by Kent Tamura.
     7
     8        This patch replaces Element::isReadOnlyFormControl() by
     9        Element::shouldMatchReadOnlySelector/shouldMatchReadOnlySelector or
     10        HTMLFormControlElement::readOnly() to make intention of functions
     11        self descriptive.
     12
     13        No new tests. This patch doesn't change behavior.
     14
     15        * css/SelectorChecker.cpp:
     16        (WebCore::SelectorChecker::checkOneSelector): Replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class, and replaced isReadOnlyFormControl() by shouldMatchReadOnlySelector() for :read-only pseudo class.
     17        * dom/Element.cpp:
     18        (WebCore::Element::shouldMatchReadOnlySelector): Added for default implementation.
     19        (WebCore::Element::shouldMatchReadWriteSelector): for default implementation.
     20        * dom/Element.h:
     21        (Element): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
     22        * html/HTMLFormControlElement.cpp:
     23        (WebCore::HTMLFormControlElement::shouldMatchReadOnlySelector): Added.
     24        (WebCore::HTMLFormControlElement::shouldMatchReadWriteSelector): Added.
     25        * html/HTMLFormControlElement.h:
     26        (HTMLFormControlElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
     27        * html/shadow/SliderThumbElement.cpp:
     28        (WebCore::SliderThumbElement::shouldMatchReadOnlySelector): Added.
     29        (WebCore::SliderThumbElement::shouldMatchReadWriteSelector): Added.
     30        (WebCore::SliderThumbElement::willRespondToMouseMoveEvents): Replaced isReadOnlyFormControl() by readOnly().
     31        (WebCore::SliderThumbElement::willRespondToMouseClickEvents): ditto.
     32        (SliderThumbElement):
     33        * html/shadow/TextControlInnerElements.cpp:
     34        (WebCore::SearchFieldCancelButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
     35        (WebCore::SpinButtonElement::willRespondToMouseMoveEvents): ditto.
     36        (WebCore::SpinButtonElement::willRespondToMouseClickEvents): ditto.
     37        (WebCore::SpinButtonElement::shouldMatchReadOnlySelector): Added.
     38        (WebCore::SpinButtonElement::shouldMatchReadWriteSelector): Added.
     39        (WebCore::InputFieldSpeechButtonElement::willRespondToMouseClickEvents): Replaced isReadOnlyFormControl() by readOnly().
     40        * html/shadow/TextControlInnerElements.h:
     41        (SpinButtonElement): Removed isReadOnlyFormControl() and added shouldMatchReadOnlySelector and shouldMatchReadWriteSelector.
     42        * rendering/RenderTheme.cpp:
     43        (WebCore::RenderTheme::isReadOnlyControl): Replaced isReadOnlyControl() by shouldMatchReadOnlySelector().
     44
    1452012-07-31  Xingnan Wang  <xingnan.wang@intel.com>
    246

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

    r124174 r124180  
    10671067            if (!element || !element->isFormControlElement())
    10681068                return false;
    1069             return element->isTextFormControl() && element->isReadOnlyFormControl();
     1069            return element->isTextFormControl() && element->shouldMatchReadOnlySelector();
    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

    r124174 r124180  
    17841784}
    17851785
     1786bool Element::shouldMatchReadOnlySelector() const
     1787{
     1788    return false;
     1789}
     1790
     1791bool Element::shouldMatchReadWriteSelector() const
     1792{
     1793    return false;
     1794}
     1795
    17861796bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
    17871797{

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

    r124174 r124180  
    351351    unsigned childElementCount() const;
    352352
     353    virtual bool shouldMatchReadOnlySelector() const;
     354    virtual bool shouldMatchReadWriteSelector() const;
    353355    bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
    354356
    … …  
    374376    virtual bool isFormControlElement() const { return false; }
    375377    virtual bool isEnabledFormControl() const { return true; }
    376     virtual bool isReadOnlyFormControl() const { return false; }
    377378    virtual bool isSpinButtonElement() const { return false; }
    378379    virtual bool isTextFormControl() const { return false; }

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

    r123713 r124180  
    483483}
    484484
     485bool HTMLFormControlElement::shouldMatchReadOnlySelector() const
     486{
     487    return readOnly();
     488}
     489
     490bool HTMLFormControlElement::shouldMatchReadWriteSelector() const
     491{
     492    return !readOnly();
     493}
     494
    485495bool HTMLFormControlElement::validationMessageShadowTreeContains(Node* node) const
    486496{

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

    r124174 r124180  
    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 shouldMatchReadOnlySelector() const OVERRIDE;
     85    virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
    8586
    8687    virtual bool canTriggerImplicitSubmission() const { return false; }

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

    r124174 r124180  
    215215}
    216216
    217 bool SliderThumbElement::isReadOnlyFormControl() const
    218 {
    219     return hostInput()->isReadOnlyFormControl();
     217bool SliderThumbElement::shouldMatchReadOnlySelector() const
     218{
     219    return hostInput()->shouldMatchReadOnlySelector();
     220}
     221
     222bool SliderThumbElement::shouldMatchReadWriteSelector() const
     223{
     224    return hostInput()->shouldMatchReadWriteSelector();
    220225}
    221226
    … …  
    335340{
    336341    const HTMLInputElement* input = hostInput();
    337     if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl() && m_inDragMode)
     342    if (input && !input->readOnly() && input->isEnabledFormControl() && m_inDragMode)
    338343        return true;
    339344
    … …  
    344349{
    345350    const HTMLInputElement* input = hostInput();
    346     if (input && !input->isReadOnlyFormControl() && input->isEnabledFormControl())
     351    if (input && !input->readOnly() && input->isEnabledFormControl())
    347352        return true;
    348353

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

    r124174 r124180  
    6767    virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren();
    6868    virtual bool isEnabledFormControl() const;
    69     virtual bool isReadOnlyFormControl() const;
     69    virtual bool shouldMatchReadOnlySelector() const OVERRIDE;
     70    virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
    7071    virtual Node* focusDelegate();
    7172    void startDragging();

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

    r124174 r124180  
    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
    … …  
    381381        }
    382382    }
     383}
     384
     385bool SpinButtonElement::shouldMatchReadOnlySelector() const
     386{
     387    return shadowHost()->shouldMatchReadOnlySelector();
     388}
     389
     390bool SpinButtonElement::shouldMatchReadWriteSelector() const
     391{
     392    return shadowHost()->shouldMatchReadWriteSelector();
    383393}
    384394
    … …  
    515525{
    516526    const HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost());
    517     if (!input->disabled() && !input->isReadOnlyFormControl())
     527    if (!input->disabled() && !input->readOnly())
    518528        return true;
    519529

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

    r124174 r124180  
    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 shouldMatchReadOnlySelector() const OVERRIDE;
     129    virtual bool shouldMatchReadWriteSelector() const OVERRIDE;
    129130    virtual void defaultEventHandler(Event*);
    130131    void doStepAction(int);

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

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