[css-align] New CSS Value 'normal' for Content Alignment

third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

 /*
  * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 4370 matching lines @@
     }
     ASSERT_NOT_REACHED();
     return ItemPositionAuto;
 }
 
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentPosition contentPosition)
     : CSSValue(PrimitiveClass)
 {
     init(UnitType::ValueID);
     switch (contentPosition) {
-    case ContentPositionAuto:
-        m_value.valueID = CSSValueAuto;
+    case ContentPositionNormal:
+        m_value.valueID = CSSValueNormal;
         break;
     case ContentPositionBaseline:
         m_value.valueID = CSSValueBaseline;
         break;
     case ContentPositionLastBaseline:
         m_value.valueID = CSSValueLastBaseline;
         break;
     case ContentPositionCenter:
         m_value.valueID = CSSValueCenter;
         break;
@@ skipping 14 matching lines @@
         break;
     case ContentPositionRight:
         m_value.valueID = CSSValueRight;
         break;
     }
 }
 
 template<> inline ContentPosition CSSPrimitiveValue::convertTo() const
 {
     switch (m_value.valueID) {
-    case CSSValueAuto:
-        return ContentPositionAuto;
+    case CSSValueNormal:
+        return ContentPositionNormal;
     case CSSValueBaseline:
         return ContentPositionBaseline;
     case CSSValueLastBaseline:
         return ContentPositionLastBaseline;
     case CSSValueCenter:
         return ContentPositionCenter;
     case CSSValueStart:
         return ContentPositionStart;
     case CSSValueEnd:
         return ContentPositionEnd;
     case CSSValueFlexStart:
         return ContentPositionFlexStart;
     case CSSValueFlexEnd:
         return ContentPositionFlexEnd;
     case CSSValueLeft:
         return ContentPositionLeft;
     case CSSValueRight:
         return ContentPositionRight;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
-    return ContentPositionAuto;
+    return ContentPositionNormal;
 }
 
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentDistributionType contentDistribution)
     : CSSValue(PrimitiveClass)
 {
     init(UnitType::ValueID);
     switch (contentDistribution) {
     case ContentDistributionDefault:
         m_value.valueID = CSSValueDefault;
         break;
@@ skipping 165 matching lines @@
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return ContainsNone;
 }
 
 } // namespace blink
 
 #endif