Moved list-style-type to be generated in ComputedStyleBase

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
@@ skipping 1568 matching lines @@
       break;
     case EListStyleType::Circle:
       m_valueID = CSSValueCircle;
       break;
     case EListStyleType::CjkEarthlyBranch:
       m_valueID = CSSValueCjkEarthlyBranch;
       break;
     case EListStyleType::CjkHeavenlyStem:
       m_valueID = CSSValueCjkHeavenlyStem;
       break;
-    case EListStyleType::CJKIdeographic:
+    case EListStyleType::CjkIdeographic:
       m_valueID = CSSValueCjkIdeographic;
       break;
     case EListStyleType::DecimalLeadingZero:
       m_valueID = CSSValueDecimalLeadingZero;
       break;
-    case EListStyleType::DecimalListStyle:
+    case EListStyleType::Decimal:
       m_valueID = CSSValueDecimal;
       break;
     case EListStyleType::Devanagari:
       m_valueID = CSSValueDevanagari;
       break;
     case EListStyleType::Disc:
       m_valueID = CSSValueDisc;
       break;
     case EListStyleType::EthiopicHalehame:
       m_valueID = CSSValueEthiopicHalehame;
@@ skipping 72 matching lines @@
       break;
     case EListStyleType::Malayalam:
       m_valueID = CSSValueMalayalam;
       break;
     case EListStyleType::Mongolian:
       m_valueID = CSSValueMongolian;
       break;
     case EListStyleType::Myanmar:
       m_valueID = CSSValueMyanmar;
       break;
-    case EListStyleType::NoneListStyle:
+    case EListStyleType::None:
       m_valueID = CSSValueNone;
       break;
     case EListStyleType::Oriya:
       m_valueID = CSSValueOriya;
       break;
     case EListStyleType::Persian:
       m_valueID = CSSValuePersian;
       break;
     case EListStyleType::SimpChineseFormal:
       m_valueID = CSSValueSimpChineseFormal;
@@ skipping 34 matching lines @@
     case EListStyleType::Urdu:
       m_valueID = CSSValueUrdu;
       break;
   }
 }
 
 template <>
 inline EListStyleType CSSIdentifierValue::convertTo() const {
   switch (m_valueID) {
     case CSSValueNone:
-      return EListStyleType::NoneListStyle;
+      return EListStyleType::None;
     case CSSValueArabicIndic:
       return EListStyleType::ArabicIndic;
     case CSSValueArmenian:
       return EListStyleType::Armenian;
     case CSSValueBengali:
       return EListStyleType::Bengali;
     case CSSValueCambodian:
       return EListStyleType::Cambodian;
     case CSSValueCircle:
       return EListStyleType::Circle;
     case CSSValueCjkEarthlyBranch:
       return EListStyleType::CjkEarthlyBranch;
     case CSSValueCjkHeavenlyStem:
       return EListStyleType::CjkHeavenlyStem;
     case CSSValueCjkIdeographic:
-      return EListStyleType::CJKIdeographic;
+      return EListStyleType::CjkIdeographic;
     case CSSValueDecimalLeadingZero:
       return EListStyleType::DecimalLeadingZero;
     case CSSValueDecimal:
-      return EListStyleType::DecimalListStyle;
+      return EListStyleType::Decimal;
     case CSSValueDevanagari:
       return EListStyleType::Devanagari;
     case CSSValueDisc:
       return EListStyleType::Disc;
     case CSSValueEthiopicHalehame:
       return EListStyleType::EthiopicHalehame;
     case CSSValueEthiopicHalehameAm:
       return EListStyleType::EthiopicHalehameAm;
     case CSSValueEthiopicHalehameTiEt:
       return EListStyleType::EthiopicHalehameTiEt;
@@ skipping 75 matching lines @@
       return EListStyleType::UpperLatin;
     case CSSValueUpperRoman:
       return EListStyleType::UpperRoman;
     case CSSValueUrdu:
       return EListStyleType::Urdu;
     default:
       break;
   }
 
   NOTREACHED();
-  return EListStyleType::NoneListStyle;
+  return EListStyleType::None;
 }
 
 template <>
 inline CSSIdentifierValue::CSSIdentifierValue(EMarginCollapse e)
     : CSSValue(IdentifierClass) {
   switch (e) {
     case MarginCollapseCollapse:
       m_valueID = CSSValueCollapse;
       break;
     case MarginCollapseSeparate:
@@ skipping 2915 matching lines @@
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return ContainsNone;
 }
 
 }  // namespace blink
 
 #endif