Changeset 83417 in webkit


Ignore:
Timestamp:
Apr 10, 2011 8:49:38 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-10 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Simon Fraser.

Rename CSSStyleApplyProperty::inherit,initial,value applyInheritValue,applyInitialValue,applyValue
​https://bugs.webkit.org/show_bug.cgi?id=58212

No new tests - function renaming only / no functionality changes.

  • css/CSSStyleApplyProperty.cpp: Rename all instances of inherit, initial and value.
  • css/CSSStyleApplyProperty.h: Rename all instances of inherit, initial and value.
  • css/CSSStyleSelector.cpp: Rename all instances of inherit, initial and value.
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r83415 r83417  
     12011-04-10  Luke Macpherson   <macpherson@chromium.org>
     2
     3        Reviewed by Simon Fraser.
     4
     5        Rename CSSStyleApplyProperty::inherit,initial,value applyInheritValue,applyInitialValue,applyValue
     6        https://bugs.webkit.org/show_bug.cgi?id=58212
     7
     8        No new tests - function renaming only / no functionality changes.
     9
     10        * css/CSSStyleApplyProperty.cpp:
     11        Rename all instances of inherit, initial and value.
     12        * css/CSSStyleApplyProperty.h:
     13        Rename all instances of inherit, initial and value.
     14        * css/CSSStyleSelector.cpp:
     15        Rename all instances of inherit, initial and value.
     16
    1172011-04-10  Mike Lawther  <mikelawther@chromium.org>
    218

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

    r83264 r83417  
    4141class ApplyPropertyNull : public ApplyPropertyBase {
    4242public:
    43     virtual void inherit(CSSStyleSelector*) const {}
    44     virtual void initial(CSSStyleSelector*) const {}
    45     virtual void value(CSSStyleSelector*, CSSValue*) const {}
     43    virtual void applyInheritValue(CSSStyleSelector*) const {}
     44    virtual void applyInitialValue(CSSStyleSelector*) const {}
     45    virtual void applyValue(CSSStyleSelector*, CSSValue*) const {}
    4646};
    4747
    … …  
    5656    }
    5757
    58     virtual void inherit(CSSStyleSelector* selector) const
     58    virtual void applyInheritValue(CSSStyleSelector* selector) const
    5959    {
    6060        (selector->style()->*m_setter)((selector->parentStyle()->*m_getter)());
    6161    }
    6262
    63     virtual void initial(CSSStyleSelector* selector) const
     63    virtual void applyInitialValue(CSSStyleSelector* selector) const
    6464    {
    6565        (selector->style()->*m_setter)((*m_initial)());
    6666    }
    6767
    68     virtual void value(CSSStyleSelector* selector, CSSValue* value) const
     68    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
    6969    {
    7070        if (value->isPrimitiveValue())
    … …  
    8787    {
    8888    }
    89     virtual void inherit(CSSStyleSelector* selector) const
     89    virtual void applyInheritValue(CSSStyleSelector* selector) const
    9090    {
    9191        const Color& color = (selector->parentStyle()->*m_getter)();
    … …  
    9595            (selector->style()->*m_setter)(color);
    9696    }
    97     virtual void initial(CSSStyleSelector* selector) const
     97    virtual void applyInitialValue(CSSStyleSelector* selector) const
    9898    {
    9999        Color color;
    100100        (selector->style()->*m_setter)(color);
    101101    }
    102     virtual void value(CSSStyleSelector* selector, CSSValue* value) const
     102    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
    103103    {
    104104        if (value->isPrimitiveValue())
    … …  
    119119    }
    120120
    121     virtual void initial(CSSStyleSelector* selector) const
     121    virtual void applyInitialValue(CSSStyleSelector* selector) const
    122122    {
    123123        (selector->style()->*m_setter)(m_initialValue());
    124124    }
    125125
    126     virtual void value(CSSStyleSelector* selector, CSSValue* value) const
     126    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
    127127    {
    128128        if (!value->isPrimitiveValue())
    … …  
    130130
    131131        if ((static_cast<CSSPrimitiveValue*>(value))->getIdent() == CSSValueCurrentcolor)
    132             inherit(selector);
     132            applyInheritValue(selector);
    133133        else
    134             ApplyPropertyColorBase::value(selector, value);
     134            ApplyPropertyColorBase::applyValue(selector, value);
    135135    }
    136136protected:
    … …  
    146146    }
    147147
    148     virtual void value(CSSStyleSelector* selector, CSSValue* value) const
    149     {
    150         ApplyPropertyDefault<TextDirection>::value(selector, value);
     148    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
     149    {
     150        ApplyPropertyDefault<TextDirection>::applyValue(selector, value);
    151151        Element* element = selector->element();
    152152        if (element && selector->element() == element->document()->documentElement())
    … …  
    175175    }
    176176
    177     virtual void inherit(CSSStyleSelector* selector) const
     177    virtual void applyInheritValue(CSSStyleSelector* selector) const
    178178    {
    179179        FillLayer* currChild = (selector->style()->*m_accessLayers)();
    … …  
    199199    }
    200200
    201     virtual void initial(CSSStyleSelector* selector) const
     201    virtual void applyInitialValue(CSSStyleSelector* selector) const
    202202    {
    203203        FillLayer* currChild = (selector->style()->*m_accessLayers)();
    … …  
    207207    }
    208208
    209     virtual void value(CSSStyleSelector* selector, CSSValue* value) const
     209    virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
    210210    {
    211211        FillLayer* currChild = (selector->style()->*m_accessLayers)();

  • trunk/Source/WebCore/css/CSSStyleApplyProperty.h

    r83241 r83417  
    4040    ApplyPropertyBase() { }
    4141    virtual ~ApplyPropertyBase() { }
    42     virtual void inherit(CSSStyleSelector*) const = 0;
    43     virtual void initial(CSSStyleSelector*) const = 0;
    44     virtual void value(CSSStyleSelector*, CSSValue*) const = 0;
     42    virtual void applyInheritValue(CSSStyleSelector*) const = 0;
     43    virtual void applyInitialValue(CSSStyleSelector*) const = 0;
     44    virtual void applyValue(CSSStyleSelector*, CSSValue*) const = 0;
    4545};
    4646
    … …  
    5050    static const CSSStyleApplyProperty& sharedCSSStyleApplyProperty();
    5151
    52     void inherit(CSSPropertyID property, CSSStyleSelector* selector) const
     52    void applyInheritValue(CSSPropertyID property, CSSStyleSelector* selector) const
    5353    {
    5454        ASSERT(implements(property));
    55         propertyValue(property)->inherit(selector);
     55        propertyValue(property)->applyInheritValue(selector);
    5656    }
    5757
    58     void initial(CSSPropertyID property, CSSStyleSelector* selector) const
     58    void applyInitialValue(CSSPropertyID property, CSSStyleSelector* selector) const
    5959    {
    6060        ASSERT(implements(property));
    61         propertyValue(property)->initial(selector);
     61        propertyValue(property)->applyInitialValue(selector);
    6262    }
    6363
    64     void value(CSSPropertyID property, CSSStyleSelector* selector, CSSValue* value) const
     64    void applyValue(CSSPropertyID property, CSSStyleSelector* selector, CSSValue* value) const
    6565    {
    6666        ASSERT(implements(property));
    67         propertyValue(property)->value(selector, value);
     67        propertyValue(property)->applyValue(selector, value);
    6868    }
    6969

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

    r83400 r83417  
    36433643    if (m_applyProperty.implements(property)) {
    36443644        if (isInherit)
    3645             m_applyProperty.inherit(property, this);
     3645            m_applyProperty.applyInheritValue(property, this);
    36463646        else if (isInitial)
    3647             m_applyProperty.initial(property, this);
     3647            m_applyProperty.applyInitialValue(property, this);
    36483648        else
    3649             m_applyProperty.value(property, this, value);
     3649            m_applyProperty.applyValue(property, this, value);
    36503650        return;
    36513651    }
Note: See TracChangeset for help on using the changeset viewer.