Changeset 150366 in webkit
- Timestamp:
- May 20, 2013 6:44:15 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r150364 r150366 1 2013-05-20 Lamarque V. Souza <Lamarque.Souza@basyskom.com> 2 3 -webkit-text-underline-position should not be inherited 4 https://bugs.webkit.org/show_bug.cgi?id=116363 5 6 Reviewed by Dean Jackson. 7 8 Update expected results. 9 10 * fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt: 11 * fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js: 12 1 13 2013-05-20 Grzegorz Czajkowski <g.czajkowski@samsung.com> 2 14 -
trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt
r145450 r150366 48 48 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under' 49 49 50 Ancestor inheritsvalues from parent:50 Ancestor does not inherit values from parent: 51 51 PASS e.style.getPropertyCSSValue('-webkit-text-underline-position') is null 52 PASS computedStyle.webkitTextUnderlinePosition is ' under'52 PASS computedStyle.webkitTextUnderlinePosition is 'auto' 53 53 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').toString() is '[object CSSPrimitiveValue]' 54 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is ' under'54 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'auto' 55 55 56 56 Value 'auto alphabetic': -
trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js
r145450 r150366 66 66 67 67 testContainer.innerHTML = '<div id="test-parent" style="-webkit-text-underline-position: under;">hello <span id="test-ancestor">world</span></div>'; 68 debug("Ancestor inheritsvalues from parent:");68 debug("Ancestor does not inherit values from parent:"); 69 69 e = document.getElementById('test-ancestor'); 70 70 testElementStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", null, ""); 71 testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", " under");71 testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "auto"); 72 72 debug(''); 73 73 -
trunk/Source/WebCore/ChangeLog
r150365 r150366 1 2013-05-20 Lamarque V. Souza <Lamarque.Souza@basyskom.com> 2 3 -webkit-text-underline-position should not be inherited 4 https://bugs.webkit.org/show_bug.cgi?id=116363 5 6 Reviewed by Dean Jackson. 7 8 Specification says text-underline-position should not be inherited. 9 10 No new tests, this updates existing tests. 11 12 * css/CSSProperty.cpp: 13 (WebCore::CSSProperty::isInheritedProperty): Make 14 CSSPropertyWebkitTextUnderlinePosition return false. 15 * rendering/style/RenderStyle.h: Treat TextUnderlinePosition as 16 non-inherited. 17 * rendering/style/StyleRareInheritedData.cpp: 18 (WebCore::StyleRareInheritedData::StyleRareInheritedData): 19 (WebCore::StyleRareInheritedData::operator==): Remove m_textUnderlinePosition. 20 * rendering/style/StyleRareInheritedData.h: 21 (StyleRareInheritedData): 22 * rendering/style/StyleRareNonInheritedData.cpp: 23 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 24 (WebCore::StyleRareNonInheritedData::operator==): Add m_textUnderlinePosition. 25 * rendering/style/StyleRareNonInheritedData.h: 26 (StyleRareNonInheritedData): 27 1 28 2013-05-20 Lamarque V. Souza <Lamarque.Souza@basyskom.com> 2 29 -
trunk/Source/WebCore/css/CSSProperty.cpp
r149623 r150366 333 333 case CSSPropertyWebkitTextAlignLast: 334 334 case CSSPropertyWebkitTextJustify: 335 case CSSPropertyWebkitTextUnderlinePosition:336 335 #endif // CSS3_TEXT 337 336 case CSSPropertyWebkitTextDecorationsInEffect: … … 649 648 case CSSPropertyWebkitTextDecorationStyle: 650 649 case CSSPropertyWebkitTextDecorationColor: 650 case CSSPropertyWebkitTextUnderlinePosition: 651 651 #endif // CSS3_TEXT 652 652 case CSSPropertyWebkitTransform: -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r150348 r150366 581 581 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); } 582 582 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheritedData->m_textJustify); } 583 TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rare InheritedData->m_textUnderlinePosition); }583 TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareNonInheritedData->m_textUnderlinePosition); } 584 584 #else 585 585 TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; } … … 1151 1151 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); } 1152 1152 void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustify, v); } 1153 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rare InheritedData, m_textUnderlinePosition, v); }1153 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareNonInheritedData, m_textUnderlinePosition, v); } 1154 1154 #endif // CSS3_TEXT 1155 1155 void setDirection(TextDirection v) { inherited_flags._direction = v; } -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp
r149700 r150366 107 107 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 108 108 , m_textJustify(RenderStyle::initialTextJustify()) 109 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())110 109 #endif // CSS3_TEXT 111 110 , m_rubyPosition(RenderStyle::initialRubyPosition()) … … 182 181 , m_textAlignLast(o.m_textAlignLast) 183 182 , m_textJustify(o.m_textJustify) 184 , m_textUnderlinePosition(o.m_textUnderlinePosition)185 183 #endif // CSS3_TEXT 186 184 , m_rubyPosition(o.m_rubyPosition) … … 292 290 && m_textAlignLast == o.m_textAlignLast 293 291 && m_textJustify == o.m_textJustify 294 && m_textUnderlinePosition == o.m_textUnderlinePosition295 292 #endif // CSS3_TEXT 296 293 && m_rubyPosition == o.m_rubyPosition -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r148921 r150366 121 121 unsigned m_textAlignLast : 3; // TextAlignLast 122 122 unsigned m_textJustify : 3; // TextJustify 123 unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition124 123 #endif // CSS3_TEXT 125 124 unsigned m_rubyPosition : 1; // RubyPosition -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r148921 r150366 76 76 #if ENABLE(CSS3_TEXT) 77 77 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 78 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 78 79 #endif // CSS3_TEXT 79 80 , m_wrapFlow(RenderStyle::initialWrapFlow()) … … 159 160 #if ENABLE(CSS3_TEXT) 160 161 , m_textDecorationStyle(o.m_textDecorationStyle) 162 , m_textUnderlinePosition(o.m_textUnderlinePosition) 161 163 #endif // CSS3_TEXT 162 164 , m_wrapFlow(o.m_wrapFlow) … … 248 250 #if ENABLE(CSS3_TEXT) 249 251 && m_textDecorationStyle == o.m_textDecorationStyle 252 && m_textUnderlinePosition == o.m_textUnderlinePosition 250 253 #endif // CSS3_TEXT 251 254 && m_wrapFlow == o.m_wrapFlow -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r148921 r150366 184 184 #if ENABLE(CSS3_TEXT) 185 185 unsigned m_textDecorationStyle : 3; // TextDecorationStyle 186 unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition 186 187 #endif // CSS3_TEXT 187 188 unsigned m_wrapFlow: 3; // WrapFlow
Note: See TracChangeset
for help on using the changeset viewer.