Changeset 90271 in webkit


Ignore:
Timestamp:
Jul 1, 2011 1:29:55 PM (13 years ago)
Author:
tony@chromium.org
Message:

2011-07-01 Tony Chang <​tony@chromium.org>

cleanup of flexbox and marquee data naming in StyleRareNonInheritedData
​https://bugs.webkit.org/show_bug.cgi?id=63827

Reviewed by Ojan Vafai.

  • rendering/style/RenderStyle.cpp: (WebCore::RenderStyle::RenderStyle): (WebCore::RenderStyle::diff):
  • rendering/style/RenderStyle.h: (WebCore::InheritedFlags::boxAlign): (WebCore::InheritedFlags::boxFlex): (WebCore::InheritedFlags::boxFlexGroup): (WebCore::InheritedFlags::boxLines): (WebCore::InheritedFlags::boxOrdinalGroup): (WebCore::InheritedFlags::boxOrient): (WebCore::InheritedFlags::boxPack): (WebCore::InheritedFlags::marqueeIncrement): (WebCore::InheritedFlags::marqueeSpeed): (WebCore::InheritedFlags::marqueeLoopCount): (WebCore::InheritedFlags::marqueeBehavior): (WebCore::InheritedFlags::marqueeDirection): (WebCore::InheritedFlags::setBoxAlign): (WebCore::InheritedFlags::setBoxFlex): (WebCore::InheritedFlags::setBoxFlexGroup): (WebCore::InheritedFlags::setBoxLines): (WebCore::InheritedFlags::setBoxOrdinalGroup): (WebCore::InheritedFlags::setBoxOrient): (WebCore::InheritedFlags::setBoxPack): (WebCore::InheritedFlags::setMarqueeIncrement): (WebCore::InheritedFlags::setMarqueeSpeed): (WebCore::InheritedFlags::setMarqueeDirection): (WebCore::InheritedFlags::setMarqueeBehavior): (WebCore::InheritedFlags::setMarqueeLoopCount):
  • rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): (WebCore::StyleRareNonInheritedData::operator==):
  • rendering/style/StyleRareNonInheritedData.h:

flexibleBox -> m_deprecatedFlexibleBox and marquee to m_marquee

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r90270 r90271  
     12011-07-01  Tony Chang  <tony@chromium.org>
     2
     3        cleanup of flexbox and marquee data naming in StyleRareNonInheritedData
     4        https://bugs.webkit.org/show_bug.cgi?id=63827
     5
     6        Reviewed by Ojan Vafai.
     7
     8        * rendering/style/RenderStyle.cpp:
     9        (WebCore::RenderStyle::RenderStyle):
     10        (WebCore::RenderStyle::diff):
     11        * rendering/style/RenderStyle.h:
     12        (WebCore::InheritedFlags::boxAlign):
     13        (WebCore::InheritedFlags::boxFlex):
     14        (WebCore::InheritedFlags::boxFlexGroup):
     15        (WebCore::InheritedFlags::boxLines):
     16        (WebCore::InheritedFlags::boxOrdinalGroup):
     17        (WebCore::InheritedFlags::boxOrient):
     18        (WebCore::InheritedFlags::boxPack):
     19        (WebCore::InheritedFlags::marqueeIncrement):
     20        (WebCore::InheritedFlags::marqueeSpeed):
     21        (WebCore::InheritedFlags::marqueeLoopCount):
     22        (WebCore::InheritedFlags::marqueeBehavior):
     23        (WebCore::InheritedFlags::marqueeDirection):
     24        (WebCore::InheritedFlags::setBoxAlign):
     25        (WebCore::InheritedFlags::setBoxFlex):
     26        (WebCore::InheritedFlags::setBoxFlexGroup):
     27        (WebCore::InheritedFlags::setBoxLines):
     28        (WebCore::InheritedFlags::setBoxOrdinalGroup):
     29        (WebCore::InheritedFlags::setBoxOrient):
     30        (WebCore::InheritedFlags::setBoxPack):
     31        (WebCore::InheritedFlags::setMarqueeIncrement):
     32        (WebCore::InheritedFlags::setMarqueeSpeed):
     33        (WebCore::InheritedFlags::setMarqueeDirection):
     34        (WebCore::InheritedFlags::setMarqueeBehavior):
     35        (WebCore::InheritedFlags::setMarqueeLoopCount):
     36        * rendering/style/StyleRareNonInheritedData.cpp:
     37        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     38        (WebCore::StyleRareNonInheritedData::operator==):
     39        * rendering/style/StyleRareNonInheritedData.h:
     40            flexibleBox -> m_deprecatedFlexibleBox and marquee to m_marquee
     41
    1422011-07-01  Mike Reed  <reed@google.com>
    243

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r89142 r90271  
    118118    surround.init();
    119119    rareNonInheritedData.init();
    120     rareNonInheritedData.access()->flexibleBox.init();
    121     rareNonInheritedData.access()->marquee.init();
     120    rareNonInheritedData.access()->m_deprecatedFlexibleBox.init();
     121    rareNonInheritedData.access()->m_marquee.init();
    122122    rareNonInheritedData.access()->m_multiCol.init();
    123123    rareNonInheritedData.access()->m_transform.init();
    … …  
    345345            return StyleDifferenceLayout;
    346346
    347         if (rareNonInheritedData->flexibleBox.get() != other->rareNonInheritedData->flexibleBox.get()
    348             && *rareNonInheritedData->flexibleBox.get() != *other->rareNonInheritedData->flexibleBox.get())
     347        if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNonInheritedData->m_deprecatedFlexibleBox.get()
     348            && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->rareNonInheritedData->m_deprecatedFlexibleBox.get())
    349349            return StyleDifferenceLayout;
    350350

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r90253 r90271  
    662662    float opacity() const { return rareNonInheritedData->opacity; }
    663663    ControlPart appearance() const { return static_cast<ControlPart>(rareNonInheritedData->m_appearance); }
    664     EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonInheritedData->flexibleBox->align); }
     664    EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonInheritedData->m_deprecatedFlexibleBox->align); }
    665665    EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inherited_flags._box_direction); }
    666     float boxFlex() { return rareNonInheritedData->flexibleBox->flex; }
    667     unsigned int boxFlexGroup() const { return rareNonInheritedData->flexibleBox->flex_group; }
    668     EBoxLines boxLines() { return static_cast<EBoxLines>(rareNonInheritedData->flexibleBox->lines); }
    669     unsigned int boxOrdinalGroup() const { return rareNonInheritedData->flexibleBox->ordinal_group; }
    670     EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInheritedData->flexibleBox->orient); }
    671     EBoxAlignment boxPack() const { return static_cast<EBoxAlignment>(rareNonInheritedData->flexibleBox->pack); }
     666    float boxFlex() { return rareNonInheritedData->m_deprecatedFlexibleBox->flex; }
     667    unsigned int boxFlexGroup() const { return rareNonInheritedData->m_deprecatedFlexibleBox->flex_group; }
     668    EBoxLines boxLines() { return static_cast<EBoxLines>(rareNonInheritedData->m_deprecatedFlexibleBox->lines); }
     669    unsigned int boxOrdinalGroup() const { return rareNonInheritedData->m_deprecatedFlexibleBox->ordinal_group; }
     670    EBoxOrient boxOrient() const { return static_cast<EBoxOrient>(rareNonInheritedData->m_deprecatedFlexibleBox->orient); }
     671    EBoxAlignment boxPack() const { return static_cast<EBoxAlignment>(rareNonInheritedData->m_deprecatedFlexibleBox->pack); }
    672672
    673673    const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
    … …  
    680680    StyleReflection* boxReflect() const { return rareNonInheritedData->m_boxReflect.get(); }
    681681    EBoxSizing boxSizing() const { return m_box->boxSizing(); }
    682     Length marqueeIncrement() const { return rareNonInheritedData->marquee->increment; }
    683     int marqueeSpeed() const { return rareNonInheritedData->marquee->speed; }
    684     int marqueeLoopCount() const { return rareNonInheritedData->marquee->loops; }
    685     EMarqueeBehavior marqueeBehavior() const { return static_cast<EMarqueeBehavior>(rareNonInheritedData->marquee->behavior); }
    686     EMarqueeDirection marqueeDirection() const { return static_cast<EMarqueeDirection>(rareNonInheritedData->marquee->direction); }
     682    Length marqueeIncrement() const { return rareNonInheritedData->m_marquee->increment; }
     683    int marqueeSpeed() const { return rareNonInheritedData->m_marquee->speed; }
     684    int marqueeLoopCount() const { return rareNonInheritedData->m_marquee->loops; }
     685    EMarqueeBehavior marqueeBehavior() const { return static_cast<EMarqueeBehavior>(rareNonInheritedData->m_marquee->behavior); }
     686    EMarqueeDirection marqueeDirection() const { return static_cast<EMarqueeDirection>(rareNonInheritedData->m_marquee->direction); }
    687687    EUserModify userModify() const { return static_cast<EUserModify>(rareInheritedData->userModify); }
    688688    EUserDrag userDrag() const { return static_cast<EUserDrag>(rareNonInheritedData->userDrag); }
    … …  
    10281028    void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
    10291029    // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
    1030     void setBoxAlign(EBoxAlignment a) { ASSERT(a == BSTRETCH || a == BSTART || a == BCENTER || a == BEND || a == BBASELINE); SET_VAR(rareNonInheritedData.access()->flexibleBox, align, a); }
     1030    void setBoxAlign(EBoxAlignment a) { ASSERT(a == BSTRETCH || a == BSTART || a == BCENTER || a == BEND || a == BBASELINE); SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, align, a); }
    10311031    void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; }
    1032     void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->flexibleBox, flex, f); }
    1033     void setBoxFlexGroup(unsigned int fg) { SET_VAR(rareNonInheritedData.access()->flexibleBox, flex_group, fg); }
    1034     void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->flexibleBox, lines, l); }
    1035     void setBoxOrdinalGroup(unsigned int og) { SET_VAR(rareNonInheritedData.access()->flexibleBox, ordinal_group, og); }
    1036     void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->flexibleBox, orient, o); }
    1037     void setBoxPack(EBoxAlignment p) { SET_VAR(rareNonInheritedData.access()->flexibleBox, pack, p); }
     1032    void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, flex, f); }
     1033    void setBoxFlexGroup(unsigned int fg) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, flex_group, fg); }
     1034    void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, lines, l); }
     1035    void setBoxOrdinalGroup(unsigned int og) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, ordinal_group, og); }
     1036    void setBoxOrient(EBoxOrient o) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, orient, o); }
     1037    void setBoxPack(EBoxAlignment p) { SET_VAR(rareNonInheritedData.access()->m_deprecatedFlexibleBox, pack, p); }
    10381038    void setBoxShadow(PassOwnPtr<ShadowData>, bool add = false);
    10391039    void setBoxReflect(PassRefPtr<StyleReflection> reflect) { if (rareNonInheritedData->m_boxReflect != reflect) rareNonInheritedData.access()->m_boxReflect = reflect; }
    10401040    void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); }
    1041     void setMarqueeIncrement(const Length& f) { SET_VAR(rareNonInheritedData.access()->marquee, increment, f); }
    1042     void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->marquee, speed, f); }
    1043     void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData.access()->marquee, direction, d); }
    1044     void setMarqueeBehavior(EMarqueeBehavior b) { SET_VAR(rareNonInheritedData.access()->marquee, behavior, b); }
    1045     void setMarqueeLoopCount(int i) { SET_VAR(rareNonInheritedData.access()->marquee, loops, i); }
     1041    void setMarqueeIncrement(const Length& f) { SET_VAR(rareNonInheritedData.access()->m_marquee, increment, f); }
     1042    void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marquee, speed, f); }
     1043    void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData.access()->m_marquee, direction, d); }
     1044    void setMarqueeBehavior(EMarqueeBehavior b) { SET_VAR(rareNonInheritedData.access()->m_marquee, behavior, b); }
     1045    void setMarqueeLoopCount(int i) { SET_VAR(rareNonInheritedData.access()->m_marquee, loops, i); }
    10461046    void setUserModify(EUserModify u) { SET_VAR(rareInheritedData, userModify, u); }
    10471047    void setUserDrag(EUserDrag d) { SET_VAR(rareNonInheritedData, userDrag, d); }

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r88308 r90271  
    6363    , lineClamp(o.lineClamp)
    6464    , opacity(o.opacity)
    65     , flexibleBox(o.flexibleBox)
    66     , marquee(o.marquee)
     65    , m_deprecatedFlexibleBox(o.m_deprecatedFlexibleBox)
     66    , m_marquee(o.m_marquee)
    6767    , m_multiCol(o.m_multiCol)
    6868    , m_transform(o.m_transform)
    … …  
    109109#endif
    110110        && opacity == o.opacity
    111         && flexibleBox == o.flexibleBox
    112         && marquee == o.marquee
     111        && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox
     112        && m_marquee == o.m_marquee
    113113        && m_multiCol == o.m_multiCol
    114114        && m_transform == o.m_transform

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

    r90253 r90271  
    9090    float opacity; // Whether or not we're transparent.
    9191
    92     DataRef<StyleDeprecatedFlexibleBoxData> flexibleBox; // Flexible box properties
    93     DataRef<StyleMarqueeData> marquee; // Marquee properties
     92    DataRef<StyleDeprecatedFlexibleBoxData> m_deprecatedFlexibleBox; // Flexible box properties
     93    DataRef<StyleMarqueeData> m_marquee; // Marquee properties
    9494    DataRef<StyleMultiColData> m_multiCol; //  CSS3 multicol properties
    9595    DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
Note: See TracChangeset for help on using the changeset viewer.