Changeset 150941 in webkit
- Timestamp:
- May 29, 2013 6:21:37 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r150929 r150941 1 2013-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 1 12 2013-05-29 Jer Noble <jer.noble@apple.com> 2 13 -
trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt
r150366 r150941 48 48 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under' 49 49 50 Ancestor does not inheritvalues from parent:50 Ancestor inherits values from parent: 51 51 PASS e.style.getPropertyCSSValue('-webkit-text-underline-position') is null 52 PASS computedStyle.webkitTextUnderlinePosition is ' auto'52 PASS computedStyle.webkitTextUnderlinePosition is 'under' 53 53 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').toString() is '[object CSSPrimitiveValue]' 54 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is ' auto'54 PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under' 55 55 56 56 Value 'auto alphabetic': -
trunk/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js
r150366 r150941 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 does not inheritvalues from parent:");68 debug("Ancestor inherits 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]", " auto");71 testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "under"); 72 72 debug(''); 73 73 -
trunk/Source/WebCore/ChangeLog
r150940 r150941 1 2013-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 1 23 2013-05-29 Ryuan Choi <ryuan.choi@samsung.com> 2 24 -
trunk/Source/WebCore/css/CSSProperty.cpp
r150366 r150941 333 333 case CSSPropertyWebkitTextAlignLast: 334 334 case CSSPropertyWebkitTextJustify: 335 case CSSPropertyWebkitTextUnderlinePosition: 335 336 #endif // CSS3_TEXT 336 337 case CSSPropertyWebkitTextDecorationsInEffect: … … 648 649 case CSSPropertyWebkitTextDecorationStyle: 649 650 case CSSPropertyWebkitTextDecorationColor: 650 case CSSPropertyWebkitTextUnderlinePosition:651 651 #endif // CSS3_TEXT 652 652 case CSSPropertyWebkitTransform: -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r150901 r150941 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 NonInheritedData->m_textUnderlinePosition); }583 TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->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 NonInheritedData, m_textUnderlinePosition, v); }1153 void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, 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
r150366 r150941 107 107 , m_textAlignLast(RenderStyle::initialTextAlignLast()) 108 108 , m_textJustify(RenderStyle::initialTextJustify()) 109 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) 109 110 #endif // CSS3_TEXT 110 111 , m_rubyPosition(RenderStyle::initialRubyPosition()) … … 181 182 , m_textAlignLast(o.m_textAlignLast) 182 183 , m_textJustify(o.m_textJustify) 184 , m_textUnderlinePosition(o.m_textUnderlinePosition) 183 185 #endif // CSS3_TEXT 184 186 , m_rubyPosition(o.m_rubyPosition) … … 290 292 && m_textAlignLast == o.m_textAlignLast 291 293 && m_textJustify == o.m_textJustify 294 && m_textUnderlinePosition == o.m_textUnderlinePosition 292 295 #endif // CSS3_TEXT 293 296 && m_rubyPosition == o.m_rubyPosition -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r150366 r150941 121 121 unsigned m_textAlignLast : 3; // TextAlignLast 122 122 unsigned m_textJustify : 3; // TextJustify 123 unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition 123 124 #endif // CSS3_TEXT 124 125 unsigned m_rubyPosition : 1; // RubyPosition -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r150366 r150941 76 76 #if ENABLE(CSS3_TEXT) 77 77 , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) 78 , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition())79 78 #endif // CSS3_TEXT 80 79 , m_wrapFlow(RenderStyle::initialWrapFlow()) … … 160 159 #if ENABLE(CSS3_TEXT) 161 160 , m_textDecorationStyle(o.m_textDecorationStyle) 162 , m_textUnderlinePosition(o.m_textUnderlinePosition)163 161 #endif // CSS3_TEXT 164 162 , m_wrapFlow(o.m_wrapFlow) … … 250 248 #if ENABLE(CSS3_TEXT) 251 249 && m_textDecorationStyle == o.m_textDecorationStyle 252 && m_textUnderlinePosition == o.m_textUnderlinePosition253 250 #endif // CSS3_TEXT 254 251 && m_wrapFlow == o.m_wrapFlow -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r150366 r150941 184 184 #if ENABLE(CSS3_TEXT) 185 185 unsigned m_textDecorationStyle : 3; // TextDecorationStyle 186 unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition187 186 #endif // CSS3_TEXT 188 187 unsigned m_wrapFlow: 3; // WrapFlow
Note: See TracChangeset
for help on using the changeset viewer.