Merge 95071 - Fix cssText property of counter-valued CSSPrimitiveValue and avoid uninitialized re...

Source/WebCore/css/CSSPrimitiveValue.cpp

Index: Source/WebCore/css/CSSPrimitiveValue.cpp
===================================================================
--- Source/WebCore/css/CSSPrimitiveValue.cpp	(revision 95989)
+++ Source/WebCore/css/CSSPrimitiveValue.cpp	(working copy)
@@ -742,12 +742,22 @@
             text += m_value.string;
             text += ")";
             break;
-        case CSS_COUNTER:
-            text = "counter(";
-            text += String::number(m_value.num);
+        case CSS_COUNTER: {
+            String separator = m_value.counter->separator();
+            text = separator.isEmpty() ? "counter(" : "counters(";
+            text += m_value.counter->identifier();
+            if (!separator.isEmpty()) {
+                text += ", ";
+                text += quoteCSSStringIfNeeded(separator);
+            }
+            const char* listStyleName = getValueName(m_value.counter->listStyleNumber() + CSSValueDisc);
+            if (listStyleName) {
+                text += ", ";
+                text += listStyleName;
+            }
             text += ")";
-            // FIXME: Add list-style and separator
             break;
+        }
         case CSS_RECT: {
             DEFINE_STATIC_LOCAL(const String, rectParen, ("rect("));