Changeset 126119 in webkit


Ignore:
Timestamp:
Aug 20, 2012 7:03:27 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Removed dead code from a very old iteration of CSS counters.
​https://bugs.webkit.org/show_bug.cgi?id=94539

Patch by Elliott Sprehn <​esprehn@chromium.org> on 2012-08-20
Reviewed by Eric Seidel.

Remove two unused shorts that were on StyleRareNonInheritedData that are no longer used.

No tests, this just removes dead code.

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

  • rendering/style/RenderStyle.h:
  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

  • rendering/style/StyleRareNonInheritedData.h:

(StyleRareNonInheritedData):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r126118 r126119  
     12012-08-20  Elliott Sprehn  <esprehn@chromium.org>
     2
     3        Removed dead code from a very old iteration of CSS counters.
     4        https://bugs.webkit.org/show_bug.cgi?id=94539
     5
     6        Reviewed by Eric Seidel.
     7
     8        Remove two unused shorts that were on StyleRareNonInheritedData that are no longer used.
     9
     10        No tests, this just removes dead code.
     11
     12        * rendering/style/RenderStyle.cpp:
     13        (WebCore::RenderStyle::diff):
     14        * rendering/style/RenderStyle.h:
     15        * rendering/style/StyleRareNonInheritedData.cpp:
     16        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     17        (WebCore::StyleRareNonInheritedData::operator==):
     18        * rendering/style/StyleRareNonInheritedData.h:
     19        (StyleRareNonInheritedData):
     20
    1212012-08-20  Luke Macpherson   <macpherson@chromium.org>
    222

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

    r126105 r126119  
    567567    const CounterDirectiveMap* mapB = other->rareNonInheritedData->m_counterDirectives.get();
    568568    if (!(mapA == mapB || (mapA && mapB && *mapA == *mapB)))
    569         return StyleDifferenceLayout;
    570     if (rareNonInheritedData->m_counterIncrement != other->rareNonInheritedData->m_counterIncrement
    571         || rareNonInheritedData->m_counterReset != other->rareNonInheritedData->m_counterReset)
    572569        return StyleDifferenceLayout;
    573570

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

    r126105 r126119  
    718718    ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); }
    719719
    720     short counterIncrement() const { return rareNonInheritedData->m_counterIncrement; }
    721     short counterReset() const { return rareNonInheritedData->m_counterReset; }
    722 
    723720    EListStyleType listStyleType() const { return static_cast<EListStyleType>(inherited_flags._list_style_type); }
    724721    StyleImage* listStyleImage() const;
    … …  
    12041201    void setAspectRatioDenominator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioDenominator, v); }
    12051202    void setAspectRatioNumerator(float v) { SET_VAR(rareNonInheritedData, m_aspectRatioNumerator, v); }
    1206     void setCounterIncrement(short v) { SET_VAR(rareNonInheritedData, m_counterIncrement, v) }
    1207     void setCounterReset(short v) { SET_VAR(rareNonInheritedData, m_counterReset, v) }
    12081203
    12091204    void setListStyleType(EListStyleType v) { inherited_flags._list_style_type = v; }

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

    r126105 r126119  
    3939    , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
    4040    , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
    41     , m_counterIncrement(0)
    42     , m_counterReset(0)
    4341    , m_perspective(RenderStyle::initialPerspective())
    4442    , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
    … …  
    9492    , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
    9593    , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
    96     , m_counterIncrement(o.m_counterIncrement)
    97     , m_counterReset(o.m_counterReset)
    9894    , m_perspective(o.m_perspective)
    9995    , m_perspectiveOriginX(o.m_perspectiveOriginX)
    … …  
    174170        && m_aspectRatioDenominator == o.m_aspectRatioDenominator
    175171        && m_aspectRatioNumerator == o.m_aspectRatioNumerator
    176         && m_counterIncrement == o.m_counterIncrement
    177         && m_counterReset == o.m_counterReset
    178172        && m_perspective == o.m_perspective
    179173        && m_perspectiveOriginX == o.m_perspectiveOriginX

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

    r126105 r126119  
    9797    float m_aspectRatioDenominator;
    9898    float m_aspectRatioNumerator;
    99 
    100     short m_counterIncrement;
    101     short m_counterReset;
    10299
    103100    float m_perspective;
Note: See TracChangeset for help on using the changeset viewer.