Fix serialization of content property to always quote

Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 80 matching lines @@
     case CSSPrimitiveValue::CSS_COUNTER:
     case CSSPrimitiveValue::CSS_COUNTER_NAME:
     case CSSPrimitiveValue::CSS_IDENT:
     case CSSPrimitiveValue::CSS_PROPERTY_ID:
     case CSSPrimitiveValue::CSS_VALUE_ID:
     case CSSPrimitiveValue::CSS_PAIR:
     case CSSPrimitiveValue::CSS_RECT:
     case CSSPrimitiveValue::CSS_QUAD:
     case CSSPrimitiveValue::CSS_RGBCOLOR:
     case CSSPrimitiveValue::CSS_SHAPE:
+    case CSSPrimitiveValue::CSS_CUSTOM_IDENT:
     case CSSPrimitiveValue::CSS_STRING:
     case CSSPrimitiveValue::CSS_UNICODE_RANGE:
     case CSSPrimitiveValue::CSS_UNKNOWN:
     case CSSPrimitiveValue::CSS_URI:
         return false;
     }
 
     ASSERT_NOT_REACHED();
     return false;
 }
@@ skipping 333 matching lines @@
 }
 
 CSSPrimitiveValue::~CSSPrimitiveValue()
 {
     cleanup();
 }
 
 void CSSPrimitiveValue::cleanup()
 {
     switch (static_cast<UnitType>(m_primitiveUnitType)) {
+    case CSS_CUSTOM_IDENT:
     case CSS_STRING:
     case CSS_URI:
     case CSS_ATTR:
     case CSS_COUNTER_NAME:
         if (m_value.string)
             m_value.string->deref();
         break;
     case CSS_COUNTER:
         // We must not call deref() when oilpan is enabled because m_value.counter is traced.
 #if !ENABLE(OILPAN)
@@ skipping 457 matching lines @@
     case LengthUnitTypeCount:
         break;
     }
     ASSERT_NOT_REACHED();
     return CSSPrimitiveValue::CSS_UNKNOWN;
 }
 
 String CSSPrimitiveValue::getStringValue() const
 {
     switch (m_primitiveUnitType) {
-        case CSS_STRING:
-        case CSS_ATTR:
-        case CSS_URI:
-            return m_value.string;
-        case CSS_VALUE_ID:
-            return valueName(m_value.valueID);
-        case CSS_PROPERTY_ID:
-            return propertyName(m_value.propertyID);
-        default:
-            break;
+    case CSS_CUSTOM_IDENT:
+    case CSS_STRING:
+    case CSS_ATTR:
+    case CSS_URI:
+        return m_value.string;
+    case CSS_VALUE_ID:
+        return valueName(m_value.valueID);
+    case CSS_PROPERTY_ID:
+        return propertyName(m_value.propertyID);
+    default:
+        break;
     }
 
     return String();
 }
 
 static String formatNumber(double number, const char* suffix, unsigned suffixLength)
 {
     Decimal decimal = Decimal::fromDouble(number);
     String result = decimal.toString();
     result.append(suffix, suffixLength);
@@ skipping 64 matching lines @@
         return "fr";
     case CSS_VW:
         return "vw";
     case CSS_VH:
         return "vh";
     case CSS_VMIN:
         return "vmin";
     case CSS_VMAX:
         return "vmax";
     case CSS_UNKNOWN:
+    case CSS_CUSTOM_IDENT:
     case CSS_STRING:
     case CSS_URI:
     case CSS_VALUE_ID:
     case CSS_PROPERTY_ID:
     case CSS_ATTR:
     case CSS_COUNTER_NAME:
     case CSS_COUNTER:
     case CSS_RECT:
     case CSS_QUAD:
     case CSS_RGBCOLOR:
     case CSS_PAIR:
     case CSS_CALC:
     case CSS_SHAPE:
     case CSS_IDENT:
     case CSS_UNICODE_RANGE:
     case CSS_CALC_PERCENTAGE_WITH_NUMBER:
     case CSS_CALC_PERCENTAGE_WITH_LENGTH:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
-String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) const
+String CSSPrimitiveValue::customCSSText() const
 {
     if (m_hasCachedCSSText) {
         ASSERT(cssTextCache().contains(this));
         return cssTextCache().get(this);
     }
 
     String text;
     switch (m_primitiveUnitType) {
         case CSS_UNKNOWN:
             // FIXME
@@ skipping 21 matching lines @@
         case CSS_HZ:
         case CSS_KHZ:
         case CSS_TURN:
         case CSS_FR:
         case CSS_VW:
         case CSS_VH:
         case CSS_VMIN:
         case CSS_VMAX:
             text = formatNumber(m_value.num, unitTypeToString((UnitType)m_primitiveUnitType));
             break;
+        case CSS_CUSTOM_IDENT:
+            text = quoteCSSStringIfNeeded(m_value.string);
+            break;
         case CSS_STRING:
-            text = formattingFlag == AlwaysQuoteCSSString ? quoteCSSString(m_value.string) : quoteCSSStringIfNeeded(m_value.string);
+            text = quoteCSSString(m_value.string);
             break;
         case CSS_URI:
             text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
             break;
         case CSS_VALUE_ID:
             text = valueName(m_value.valueID);
             break;
         case CSS_PROPERTY_ID:
             text = propertyName(m_value.propertyID);
             break;
@@ skipping 93 matching lines @@
     case CSS_VW:
     case CSS_VH:
     case CSS_VMIN:
     case CSS_VMAX:
     case CSS_FR:
         return m_value.num == other.m_value.num;
     case CSS_PROPERTY_ID:
         return propertyName(m_value.propertyID) == propertyName(other.m_value.propertyID);
     case CSS_VALUE_ID:
         return valueName(m_value.valueID) == valueName(other.m_value.valueID);
+    case CSS_CUSTOM_IDENT:
     case CSS_STRING:
     case CSS_URI:
     case CSS_ATTR:
     case CSS_COUNTER_NAME:
         return equal(m_value.string, other.m_value.string);
     case CSS_COUNTER:
         return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);
     case CSS_RECT:
         return m_value.rect && other.m_value.rect && m_value.rect->equals(*other.m_value.rect);
     case CSS_QUAD:
@@ skipping 33 matching lines @@
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink