Diff
Modified: trunk/Source/WebCore/ChangeLog (139733 => 139734)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 13:31:49 UTC (rev 139734)
@@ -1,3 +1,22 @@
+2013-01-15 Dongwoo Joshua Im <[email protected]>
+
+ [CSS] Rename the enum, from "ETextAlignLast" to "TextAlignLast"
+ https://bugs.webkit.org/show_bug.cgi?id=106887
+
+ Reviewed by Alexis Menard.
+
+ No new tests are added since there is no behavior changes.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator TextAlignLast):
+ * css/StyleBuilder.cpp:
+ (WebCore::StyleBuilder::StyleBuilder):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareInheritedData.h:
+ (StyleRareInheritedData):
+
2013-01-15 Tommy Widenflycht <[email protected]>
MediaStream API: Fixing crashing bug in MediaStream
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (139733 => 139734)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2013-01-15 13:31:49 UTC (rev 139734)
@@ -2238,7 +2238,7 @@
}
#if ENABLE(CSS3_TEXT)
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAlignLast e)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_IDENT;
@@ -2267,7 +2267,7 @@
}
}
-template<> inline CSSPrimitiveValue::operator ETextAlignLast() const
+template<> inline CSSPrimitiveValue::operator TextAlignLast() const
{
switch (m_value.ident) {
case CSSValueAuto:
Modified: trunk/Source/WebCore/css/StyleBuilder.cpp (139733 => 139734)
--- trunk/Source/WebCore/css/StyleBuilder.cpp 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/css/StyleBuilder.cpp 2013-01-15 13:31:49 UTC (rev 139734)
@@ -1922,7 +1922,7 @@
#if ENABLE(CSS3_TEXT)
setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler());
setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<ETextAlignLast, &RenderStyle::textAlignLast, ETextAlignLast, &RenderStyle::setTextAlignLast, ETextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());
#endif // CSS3_TEXT
setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyLength<&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent>::createHandler());
setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (139733 => 139734)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-01-15 13:31:49 UTC (rev 139734)
@@ -563,7 +563,7 @@
ETextDecoration textDecoration() const { return static_cast<ETextDecoration>(visual->textDecoration); }
#if ENABLE(CSS3_TEXT)
TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); }
- ETextAlignLast textAlignLast() const { return static_cast<ETextAlignLast>(rareInheritedData->m_textAlignLast); }
+ TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); }
#else
TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; }
#endif // CSS3_TEXT
@@ -1102,7 +1102,7 @@
void setTextDecoration(ETextDecoration v) { SET_VAR(visual, textDecoration, v); }
#if ENABLE(CSS3_TEXT)
void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); }
- void setTextAlignLast(ETextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
+ void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); }
#endif // CSS3_TEXT
void setDirection(TextDirection v) { inherited_flags._direction = v; }
void setLineHeight(Length specifiedLineHeight);
@@ -1560,7 +1560,7 @@
static ETextDecoration initialTextDecoration() { return TDNONE; }
#if ENABLE(CSS3_TEXT)
static TextDecorationStyle initialTextDecorationStyle() { return TextDecorationStyleSolid; }
- static ETextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
+ static TextAlignLast initialTextAlignLast() { return TextAlignLastAuto; }
#endif // CSS3_TEXT
static float initialZoom() { return 1.0f; }
static int initialOutlineOffset() { return 0; }
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (139733 => 139734)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2013-01-15 13:31:49 UTC (rev 139734)
@@ -355,7 +355,7 @@
};
#if ENABLE(CSS3_TEXT)
-enum ETextAlignLast {
+enum TextAlignLast {
TextAlignLastAuto, TextAlignLastStart, TextAlignLastEnd, TextAlignLastLeft, TextAlignLastRight, TextAlignLastCenter, TextAlignLastJustify
};
#endif // CSS3_TEXT
Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (139733 => 139734)
--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2013-01-15 11:29:48 UTC (rev 139733)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2013-01-15 13:31:49 UTC (rev 139734)
@@ -117,7 +117,7 @@
unsigned m_imageResolutionSnap : 1; // ImageResolutionSnap
#endif
#if ENABLE(CSS3_TEXT)
- unsigned m_textAlignLast : 3; // ETextAlignLast
+ unsigned m_textAlignLast : 3; // TextAlignLast
#endif // CSS3_TEXT
unsigned m_rubyPosition : 1; // RubyPosition
