Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Unified Diff: Source/core/css/CSSPrimitiveValueMappings.h

Issue 131773002: Broaden justify-self's parsing name (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/parser/BisonCSSParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
index d2baffb93d63b1b6a6f1bb63ffe928f614fc6723..9329ade7517131798b8b7bba4fbf59d582ab40a1 100644
--- a/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/Source/core/css/CSSPrimitiveValueMappings.h
@@ -4985,113 +4985,113 @@ template<> inline CSSPrimitiveValue::operator LayoutBox() const
return ContentBox;
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(JustifySelf justifySelf)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ItemPosition itemPosition)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_VALUE_ID;
- switch (justifySelf) {
- case JustifySelfAuto:
+ switch (itemPosition) {
+ case ItemPositionAuto:
m_value.valueID = CSSValueAuto;
break;
- case JustifySelfStretch:
+ case ItemPositionStretch:
m_value.valueID = CSSValueStretch;
break;
- case JustifySelfBaseline:
+ case ItemPositionBaseline:
m_value.valueID = CSSValueBaseline;
break;
- case JustifySelfCenter:
+ case ItemPositionCenter:
m_value.valueID = CSSValueCenter;
break;
- case JustifySelfStart:
+ case ItemPositionStart:
m_value.valueID = CSSValueStart;
break;
- case JustifySelfEnd:
+ case ItemPositionEnd:
m_value.valueID = CSSValueEnd;
break;
- case JustifySelfSelfStart:
+ case ItemPositionSelfStart:
m_value.valueID = CSSValueSelfStart;
break;
- case JustifySelfSelfEnd:
+ case ItemPositionSelfEnd:
m_value.valueID = CSSValueSelfEnd;
break;
- case JustifySelfFlexStart:
+ case ItemPositionFlexStart:
m_value.valueID = CSSValueFlexStart;
break;
- case JustifySelfFlexEnd:
+ case ItemPositionFlexEnd:
m_value.valueID = CSSValueFlexEnd;
break;
- case JustifySelfLeft:
+ case ItemPositionLeft:
m_value.valueID = CSSValueLeft;
break;
- case JustifySelfRight:
+ case ItemPositionRight:
m_value.valueID = CSSValueRight;
break;
}
}
-template<> inline CSSPrimitiveValue::operator JustifySelf() const
+template<> inline CSSPrimitiveValue::operator ItemPosition() const
{
switch (m_value.valueID) {
case CSSValueAuto:
- return JustifySelfAuto;
+ return ItemPositionAuto;
case CSSValueStretch:
- return JustifySelfStretch;
+ return ItemPositionStretch;
case CSSValueBaseline:
- return JustifySelfBaseline;
+ return ItemPositionBaseline;
case CSSValueCenter:
- return JustifySelfCenter;
+ return ItemPositionCenter;
case CSSValueStart:
- return JustifySelfStart;
+ return ItemPositionStart;
case CSSValueEnd:
- return JustifySelfEnd;
+ return ItemPositionEnd;
case CSSValueSelfStart:
- return JustifySelfSelfStart;
+ return ItemPositionSelfStart;
case CSSValueSelfEnd:
- return JustifySelfSelfEnd;
+ return ItemPositionSelfEnd;
case CSSValueFlexStart:
- return JustifySelfFlexStart;
+ return ItemPositionFlexStart;
case CSSValueFlexEnd:
- return JustifySelfFlexEnd;
+ return ItemPositionFlexEnd;
case CSSValueLeft:
- return JustifySelfLeft;
+ return ItemPositionLeft;
case CSSValueRight:
- return JustifySelfRight;
+ return ItemPositionRight;
default:
break;
}
ASSERT_NOT_REACHED();
- return JustifySelfAuto;
+ return ItemPositionAuto;
}
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(JustifySelfOverflowAlignment overflowAlignment)
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(OverflowAlignment overflowAlignment)
: CSSValue(PrimitiveClass)
{
m_primitiveUnitType = CSS_VALUE_ID;
switch (overflowAlignment) {
- case JustifySelfOverflowAlignmentDefault:
+ case OverflowAlignmentDefault:
m_value.valueID = CSSValueDefault;
break;
- case JustifySelfOverflowAlignmentTrue:
+ case OverflowAlignmentTrue:
m_value.valueID = CSSValueTrue;
break;
- case JustifySelfOverflowAlignmentSafe:
+ case OverflowAlignmentSafe:
m_value.valueID = CSSValueSafe;
break;
}
}
-template<> inline CSSPrimitiveValue::operator JustifySelfOverflowAlignment() const
+template<> inline CSSPrimitiveValue::operator OverflowAlignment() const
{
switch (m_value.valueID) {
case CSSValueTrue:
- return JustifySelfOverflowAlignmentTrue;
+ return OverflowAlignmentTrue;
case CSSValueSafe:
- return JustifySelfOverflowAlignmentSafe;
+ return OverflowAlignmentSafe;
default:
break;
}
ASSERT_NOT_REACHED();
- return JustifySelfOverflowAlignmentTrue;
+ return OverflowAlignmentTrue;
}
}
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/parser/BisonCSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698