Changeset 139734 in webkit
- Timestamp:
- Jan 15, 2013 5:31:49 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r139732 r139734 1 2013-01-15 Dongwoo Joshua Im <dw.im@samsung.com> 2 3 [CSS] Rename the enum, from "ETextAlignLast" to "TextAlignLast" 4 https://bugs.webkit.org/show_bug.cgi?id=106887 5 6 Reviewed by Alexis Menard. 7 8 No new tests are added since there is no behavior changes. 9 10 * css/CSSPrimitiveValueMappings.h: 11 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 12 (WebCore::CSSPrimitiveValue::operator TextAlignLast): 13 * css/StyleBuilder.cpp: 14 (WebCore::StyleBuilder::StyleBuilder): 15 * rendering/style/RenderStyle.h: 16 * rendering/style/RenderStyleConstants.h: 17 * rendering/style/StyleRareInheritedData.h: 18 (StyleRareInheritedData): 19 1 20 2013-01-15 Tommy Widenflycht <tommyw@google.com> 2 21 -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r137754 r139734 2239 2239 2240 2240 #if ENABLE(CSS3_TEXT) 2241 template<> inline CSSPrimitiveValue::CSSPrimitiveValue( ETextAlignLast e)2241 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e) 2242 2242 : CSSValue(PrimitiveClass) 2243 2243 { … … 2268 2268 } 2269 2269 2270 template<> inline CSSPrimitiveValue::operator ETextAlignLast() const2270 template<> inline CSSPrimitiveValue::operator TextAlignLast() const 2271 2271 { 2272 2272 switch (m_value.ident) { -
trunk/Source/WebCore/css/StyleBuilder.cpp
r138821 r139734 1923 1923 setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler()); 1924 1924 setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler()); 1925 setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault< ETextAlignLast, &RenderStyle::textAlignLast, ETextAlignLast, &RenderStyle::setTextAlignLast, ETextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());1925 setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler()); 1926 1926 #endif // CSS3_TEXT 1927 1927 setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyLength<&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent>::createHandler()); -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r139659 r139734 564 564 #if ENABLE(CSS3_TEXT) 565 565 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); } 566 ETextAlignLast textAlignLast() const { return static_cast<ETextAlignLast>(rareInheritedData->m_textAlignLast); }566 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); } 567 567 #else 568 568 TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; } … … 1103 1103 #if ENABLE(CSS3_TEXT) 1104 1104 void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); } 1105 void setTextAlignLast( ETextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }1105 void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); } 1106 1106 #endif // CSS3_TEXT 1107 1107 void setDirection(TextDirection v) { inherited_flags._direction = v; } … … 1561 1561 #if ENABLE(CSS3_TEXT) 1562 1562 static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyleSolid; } 1563 static ETextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }1563 static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; } 1564 1564 #endif // CSS3_TEXT 1565 1565 static float initialZoom() { return 1.0f; } -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r138821 r139734 356 356 357 357 #if ENABLE(CSS3_TEXT) 358 enum ETextAlignLast {358 enum TextAlignLast { 359 359 TextAlignLastAuto, TextAlignLastStart, TextAlignLastEnd, TextAlignLastLeft, TextAlignLastRight, TextAlignLastCenter, TextAlignLastJustify 360 360 }; -
trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h
r137359 r139734 118 118 #endif 119 119 #if ENABLE(CSS3_TEXT) 120 unsigned m_textAlignLast : 3; // ETextAlignLast120 unsigned m_textAlignLast : 3; // TextAlignLast 121 121 #endif // CSS3_TEXT 122 122 unsigned m_rubyPosition : 1; // RubyPosition
Note: See TracChangeset
for help on using the changeset viewer.