Moved list-style-type to be generated in ComputedStyleBase

third_party/WebKit/Source/core/layout/ListMarkerText.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 449 matching lines @@
 
 static EListStyleType effectiveListMarkerType(EListStyleType type, int count) {
   // Note, the following switch statement has been explicitly grouped
   // by list-style-type ordinal range.
   switch (type) {
     case EListStyleType::ArabicIndic:
     case EListStyleType::Bengali:
     case EListStyleType::Cambodian:
     case EListStyleType::Circle:
     case EListStyleType::DecimalLeadingZero:
-    case EListStyleType::DecimalListStyle:
+    case EListStyleType::Decimal:
     case EListStyleType::Devanagari:
     case EListStyleType::Disc:
     case EListStyleType::Gujarati:
     case EListStyleType::Gurmukhi:
     case EListStyleType::Kannada:
     case EListStyleType::Khmer:
     case EListStyleType::Lao:
     case EListStyleType::Malayalam:
     case EListStyleType::Mongolian:
     case EListStyleType::Myanmar:
-    case EListStyleType::NoneListStyle:
+    case EListStyleType::None:
     case EListStyleType::Oriya:
     case EListStyleType::Persian:
     case EListStyleType::Square:
     case EListStyleType::Telugu:
     case EListStyleType::Thai:
     case EListStyleType::Tibetan:
     case EListStyleType::Urdu:
     case EListStyleType::KoreanHangulFormal:
     case EListStyleType::KoreanHanjaFormal:
     case EListStyleType::KoreanHanjaInformal:
-    case EListStyleType::CJKIdeographic:
+    case EListStyleType::CjkIdeographic:
     case EListStyleType::SimpChineseFormal:
     case EListStyleType::SimpChineseInformal:
     case EListStyleType::TradChineseFormal:
     case EListStyleType::TradChineseInformal:
       return type;  // Can represent all ordinals.
     case EListStyleType::Armenian:
     case EListStyleType::LowerArmenian:
     case EListStyleType::UpperArmenian:
-      return (count < 1 || count > 99999999) ? EListStyleType::DecimalListStyle
-                                             : type;
+      return (count < 1 || count > 99999999) ? EListStyleType::Decimal : type;
     case EListStyleType::Georgian:
-      return (count < 1 || count > 19999) ? EListStyleType::DecimalListStyle
-                                          : type;
+      return (count < 1 || count > 19999) ? EListStyleType::Decimal : type;
     case EListStyleType::Hebrew:
-      return (count < 0 || count > 999999) ? EListStyleType::DecimalListStyle
-                                           : type;
+      return (count < 0 || count > 999999) ? EListStyleType::Decimal : type;
     case EListStyleType::LowerRoman:
     case EListStyleType::UpperRoman:
-      return (count < 1 || count > 3999) ? EListStyleType::DecimalListStyle
-                                         : type;
+      return (count < 1 || count > 3999) ? EListStyleType::Decimal : type;
     case EListStyleType::CjkEarthlyBranch:
     case EListStyleType::CjkHeavenlyStem:
     case EListStyleType::EthiopicHalehameAm:
     case EListStyleType::EthiopicHalehame:
     case EListStyleType::EthiopicHalehameTiEr:
     case EListStyleType::EthiopicHalehameTiEt:
     case EListStyleType::Hangul:
     case EListStyleType::HangulConsonant:
     case EListStyleType::Hiragana:
     case EListStyleType::HiraganaIroha:
     case EListStyleType::Katakana:
     case EListStyleType::KatakanaIroha:
     case EListStyleType::LowerAlpha:
     case EListStyleType::LowerGreek:
     case EListStyleType::LowerLatin:
     case EListStyleType::UpperAlpha:
     case EListStyleType::UpperLatin:
-      return (count < 1) ? EListStyleType::DecimalListStyle : type;
+      return (count < 1) ? EListStyleType::Decimal : type;
   }
 
   ASSERT_NOT_REACHED();
   return type;
 }
 
 UChar suffix(EListStyleType type, int count) {
   // If the list-style-type cannot represent |count| because it's outside its
   // ordinal range then we fall back to some list style that can represent
   // |count|.
   EListStyleType effectiveType = effectiveListMarkerType(type, count);
 
   // Note, the following switch statement has been explicitly
   // grouped by list-style-type suffix.
   switch (effectiveType) {
     case EListStyleType::Circle:
     case EListStyleType::Disc:
-    case EListStyleType::NoneListStyle:
+    case EListStyleType::None:
     case EListStyleType::Square:
       return ' ';
     case EListStyleType::EthiopicHalehame:
     case EListStyleType::EthiopicHalehameAm:
     case EListStyleType::EthiopicHalehameTiEr:
     case EListStyleType::EthiopicHalehameTiEt:
       return ethiopicPrefaceColonCharacter;
     case EListStyleType::Armenian:
     case EListStyleType::ArabicIndic:
     case EListStyleType::Bengali:
     case EListStyleType::Cambodian:
-    case EListStyleType::CJKIdeographic:
+    case EListStyleType::CjkIdeographic:
     case EListStyleType::CjkEarthlyBranch:
     case EListStyleType::CjkHeavenlyStem:
     case EListStyleType::DecimalLeadingZero:
-    case EListStyleType::DecimalListStyle:
+    case EListStyleType::Decimal:
     case EListStyleType::Devanagari:
     case EListStyleType::Georgian:
     case EListStyleType::Gujarati:
     case EListStyleType::Gurmukhi:
     case EListStyleType::Hangul:
     case EListStyleType::HangulConsonant:
     case EListStyleType::Hebrew:
     case EListStyleType::Hiragana:
     case EListStyleType::HiraganaIroha:
     case EListStyleType::Kannada:
@@ skipping 32 matching lines @@
 
   ASSERT_NOT_REACHED();
   return '.';
 }
 
 String text(EListStyleType type, int count) {
   // If the list-style-type, say hebrew, cannot represent |count| because it's
   // outside its ordinal range then we fallback to some list style that can
   // represent |count|.
   switch (effectiveListMarkerType(type, count)) {
-    case EListStyleType::NoneListStyle:
+    case EListStyleType::None:
       return "";
 
     // We use the same characters for text security.
     // See LayoutText::setInternalString.
     case EListStyleType::Circle:
       return String(&whiteBulletCharacter, 1);
     case EListStyleType::Disc:
       return String(&bulletCharacter, 1);
     case EListStyleType::Square:
       // The CSS 2.1 test suite uses U+25EE BLACK MEDIUM SMALL SQUARE
       // instead, but I think this looks better.
       return String(&blackSquareCharacter, 1);
 
-    case EListStyleType::DecimalListStyle:
+    case EListStyleType::Decimal:
       return String::number(count);
     case EListStyleType::DecimalLeadingZero:
       if (count < -9 || count > 9)
         return String::number(count);
       if (count < 0)
         return "-0" + String::number(-count);  // -01 to -09
       return "0" + String::number(count);      // 00 to 09
 
     case EListStyleType::ArabicIndic: {
       static const UChar arabicIndicNumerals[10] = {
@@ skipping 240 matching lines @@
       return toCJKIdeographic(count, koreanHanjaFormalTable, Formal);
     }
     case EListStyleType::KoreanHanjaInformal: {
       static const UChar koreanHanjaInformalTable[26] = {
           Korean, 0x842C, 0x0000, 0x5104, 0x0000, 0x5146, 0x0000,
           0x5341, 0x767E, 0x5343, 0x96F6, 0x4E00, 0x4E8C, 0x4E09,
           0x56DB, 0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D, 0xB9C8,
           0xC774, 0xB108, 0xC2A4, 0x0020, 0x0000};
       return toCJKIdeographic(count, koreanHanjaInformalTable, Informal);
     }
-    case EListStyleType::CJKIdeographic:
+    case EListStyleType::CjkIdeographic:
     case EListStyleType::TradChineseInformal: {
       static const UChar traditionalChineseInformalTable[22] = {
           Chinese, 0x842C, 0x0000, 0x5104, 0x0000, 0x5146, 0x0000, 0x5341,
           0x767E,  0x5343, 0x96F6, 0x4E00, 0x4E8C, 0x4E09, 0x56DB, 0x4E94,
           0x516D,  0x4E03, 0x516B, 0x4E5D, 0x8CA0, 0x0000};
       return toCJKIdeographic(count, traditionalChineseInformalTable, Informal);
     }
     case EListStyleType::SimpChineseInformal: {
       static const UChar simpleChineseInformalTable[22] = {
           Chinese, 0x4E07, 0x0000, 0x4EBF, 0x0000, 0x4E07, 0x4EBF, 0x5341,
@@ skipping 35 matching lines @@
       return toHebrew(count);
   }
 
   ASSERT_NOT_REACHED();
   return "";
 }
 
 }  // namespace ListMarkerText
 
 }  // namespace blink