Changeset 150941 in webkit


Ignore:
Timestamp:
May 29, 2013 6:21:37 PM (11 years ago)
Author:
dino@apple.com
Message:

-webkit-text-underline-position should not be inherited
​https://bugs.webkit.org/show_bug.cgi?id=116363

Reverting ​http://trac.webkit.org/changeset/150366
It was an incorrect fix referring to an old specification.

Source/WebCore:

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

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

(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):

  • rendering/style/StyleRareInheritedData.h:

(StyleRareInheritedData):

  • rendering/style/StyleRareNonInheritedData.cpp:

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

  • rendering/style/StyleRareNonInheritedData.h:

(StyleRareNonInheritedData):

LayoutTests:

  • fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt:
  • fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r150929 r150941  
     12013-05-29  Dean Jackson  <dino@apple.com>
     2
     3        -webkit-text-underline-position should not be inherited
     4        https://bugs.webkit.org/show_bug.cgi?id=116363
     5
     6        Reverting http://trac.webkit.org/changeset/150366
     7        It was an incorrect fix referring to an old specification.
     8
     9        * fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt:
     10        * fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js:
     11
    1122013-05-29  Jer Noble  <jer.noble@apple.com>
    213

  • trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt

    r150366 r150941  
    4848PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under'
    4949
    50 Ancestor does not inherit values from parent:
     50Ancestor inherits values from parent:
    5151PASS e.style.getPropertyCSSValue('-webkit-text-underline-position') is null
    52 PASS computedStyle.webkitTextUnderlinePosition is 'auto'
     52PASS computedStyle.webkitTextUnderlinePosition is 'under'
    5353PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').toString() is '[object CSSPrimitiveValue]'
    54 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'auto'
     54PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under'
    5555
    5656Value 'auto alphabetic':

  • trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js

    r150366 r150941  
    6666
    6767testContainer.innerHTML = '<div id="test-parent" style="-webkit-text-underline-position: under;">hello <span id="test-ancestor">world</span></div>';
    68 debug("Ancestor does not inherit values from parent:");
     68debug("Ancestor inherits values from parent:");
    6969e = document.getElementById('test-ancestor');
    7070testElementStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", null, "");
    71 testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "auto");
     71testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "under");
    7272debug('');
    7373

  • trunk/Source/WebCore/ChangeLog

    r150940 r150941  
     12013-05-29  Dean Jackson  <dino@apple.com>
     2
     3        -webkit-text-underline-position should not be inherited
     4        https://bugs.webkit.org/show_bug.cgi?id=116363
     5
     6        Reverting http://trac.webkit.org/changeset/150366
     7        It was an incorrect fix referring to an old specification.
     8
     9        * css/CSSProperty.cpp:
     10        (WebCore::CSSProperty::isInheritedProperty):
     11        * rendering/style/RenderStyle.h:
     12        * rendering/style/StyleRareInheritedData.cpp:
     13        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
     14        (WebCore::StyleRareInheritedData::operator==):
     15        * rendering/style/StyleRareInheritedData.h:
     16        (StyleRareInheritedData):
     17        * rendering/style/StyleRareNonInheritedData.cpp:
     18        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     19        (WebCore::StyleRareNonInheritedData::operator==):
     20        * rendering/style/StyleRareNonInheritedData.h:
     21        (StyleRareNonInheritedData):
     22
    1232013-05-29  Ryuan Choi  <ryuan.choi@samsung.com>
    224

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

    r150366 r150941  
    333333    case CSSPropertyWebkitTextAlignLast:
    334334    case CSSPropertyWebkitTextJustify:
     335    case CSSPropertyWebkitTextUnderlinePosition:
    335336#endif // CSS3_TEXT
    336337    case CSSPropertyWebkitTextDecorationsInEffect:
    … …  
    648649    case CSSPropertyWebkitTextDecorationStyle:
    649650    case CSSPropertyWebkitTextDecorationColor:
    650     case CSSPropertyWebkitTextUnderlinePosition:
    651651#endif // CSS3_TEXT
    652652    case CSSPropertyWebkitTransform:

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

    r150901 r150941  
    581581    TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
    582582    TextJustify textJustify() const { return static_cast<TextJustify>(rareInheritedData->m_textJustify); }
    583     TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareNonInheritedData->m_textUnderlinePosition); }
     583    TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
    584584#else
    585585    TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; }
    … …  
    11511151    void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
    11521152    void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustify, v); }
    1153     void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareNonInheritedData, m_textUnderlinePosition, v); }
     1153    void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, m_textUnderlinePosition, v); }
    11541154#endif // CSS3_TEXT
    11551155    void setDirection(TextDirection v) { inherited_flags._direction = v; }

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

    r150366 r150941  
    107107    , m_textAlignLast(RenderStyle::initialTextAlignLast())
    108108    , m_textJustify(RenderStyle::initialTextJustify())
     109    , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
    109110#endif // CSS3_TEXT
    110111    , m_rubyPosition(RenderStyle::initialRubyPosition())
    … …  
    181182    , m_textAlignLast(o.m_textAlignLast)
    182183    , m_textJustify(o.m_textJustify)
     184    , m_textUnderlinePosition(o.m_textUnderlinePosition)
    183185#endif // CSS3_TEXT
    184186    , m_rubyPosition(o.m_rubyPosition)
    … …  
    290292        && m_textAlignLast == o.m_textAlignLast
    291293        && m_textJustify == o.m_textJustify
     294        && m_textUnderlinePosition == o.m_textUnderlinePosition
    292295#endif // CSS3_TEXT
    293296        && m_rubyPosition == o.m_rubyPosition

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

    r150366 r150941  
    121121    unsigned m_textAlignLast : 3; // TextAlignLast
    122122    unsigned m_textJustify : 3; // TextJustify
     123    unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition
    123124#endif // CSS3_TEXT
    124125    unsigned m_rubyPosition : 1; // RubyPosition

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

    r150366 r150941  
    7676#if ENABLE(CSS3_TEXT)
    7777    , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
    78     , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())
    7978#endif // CSS3_TEXT
    8079    , m_wrapFlow(RenderStyle::initialWrapFlow())
    … …  
    160159#if ENABLE(CSS3_TEXT)
    161160    , m_textDecorationStyle(o.m_textDecorationStyle)
    162     , m_textUnderlinePosition(o.m_textUnderlinePosition)
    163161#endif // CSS3_TEXT
    164162    , m_wrapFlow(o.m_wrapFlow)
    … …  
    250248#if ENABLE(CSS3_TEXT)
    251249        && m_textDecorationStyle == o.m_textDecorationStyle
    252         && m_textUnderlinePosition == o.m_textUnderlinePosition
    253250#endif // CSS3_TEXT
    254251        && m_wrapFlow == o.m_wrapFlow

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

    r150366 r150941  
    184184#if ENABLE(CSS3_TEXT)
    185185    unsigned m_textDecorationStyle : 3; // TextDecorationStyle
    186     unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition
    187186#endif // CSS3_TEXT
    188187    unsigned m_wrapFlow: 3; // WrapFlow
Note: See TracChangeset for help on using the changeset viewer.