Drop trailing zeroes only for rightmost group for cjk-ideographic

Source/core/layout/LayoutListMarker.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
  * License as published by the Free Software Foundation; either
@@ skipping 341 matching lines @@
         int groupValue = number % 10000;
         number /= 10000;
 
         // Process least-significant group first, but put it in the buffer last.
         AbstractCJKChar* group = &buffer[(3 - i) * groupLength];
 
         if (groupValue && i)
             group[7] = static_cast<AbstractCJKChar>(SecondGroupMarker - 1 + i);
 
         // Put in the four digits and digit markers for any non-zero digits.
-        group[6] = static_cast<AbstractCJKChar>(Digit0 + (groupValue % 10));
+        int digitValue = (groupValue % 10);
+        bool trailingZero = table[Lang] == Chinese && !digitValue;
+        if (digitValue)
+            group[6] = static_cast<AbstractCJKChar>(Digit0 + (groupValue % 10));
         if (number != 0 || groupValue > 9) {
-            int digitValue = ((groupValue / 10) % 10);
-            group[4] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
+            digitValue = ((groupValue / 10) % 10);
+            if (digitValue || !trailingZero)
+                group[4] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
+            trailingZero &= !digitValue;
             if (digitValue)
                 group[5] = SecondDigitMarker;
         }
         if (number != 0 || groupValue > 99) {
-            int digitValue = ((groupValue / 100) % 10);
-            group[2] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
+            digitValue = ((groupValue / 100) % 10);
+            if (digitValue || !trailingZero)
+                group[2] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
+            trailingZero &= !digitValue;
             if (digitValue)
                 group[3] = ThirdDigitMarker;
         }
         if (number != 0 || groupValue > 999) {
-            int digitValue = groupValue / 1000;
-            group[0] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
+            digitValue = groupValue / 1000;
+            if (digitValue || !trailingZero)
+                group[0] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
             if (digitValue)
                 group[1] = FourthDigitMarker;
         }
 
+        if (trailingZero && i > 0) {
+            group[6] = group[7];
+            group[7] = Digit0;
+        }
+
         // Remove the tens digit, but leave the marker, for any group that has
         // a value of less than 20.
         if (table[Lang] == Chinese && groupValue < 20) {
             ASSERT(group[4] == NoChar || group[4] == Digit0 || group[4] == Digit1);
             group[4] = NoChar;
         }
 
         if (number == 0)
             break;
     }
@@ skipping 48 matching lines @@
     case Myanmar:
     case NoneListStyle:
     case Oriya:
     case Persian:
     case Square:
     case Telugu:
     case Thai:
     case Tibetan:
     case Urdu:
     case KoreanHangulFormal:
+    case CJKIdeographic:
         return type; // Can represent all ordinals.
     case Armenian:
         return (value < 1 || value > 99999999) ? DecimalListStyle : type;
-    case CJKIdeographic:
-        return (value < 0) ? DecimalListStyle : type;
     case Georgian:
         return (value < 1 || value > 19999) ? DecimalListStyle : type;
     case Hebrew:
         return (value < 0 || value > 999999) ? DecimalListStyle : type;
     case LowerRoman:
     case UpperRoman:
         return (value < 1 || value > 3999) ? DecimalListStyle : type;
     case CjkEarthlyBranch:
     case CjkHeavenlyStem:
     case EthiopicHalehameAm:
@@ skipping 899 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink