Change Counter to be a CSSValue

Source/core/css/CSSValue.cpp

 /*
  * Copyright (C) 2011 Andreas Kling (kling@webkit.org)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "config.h"
 #include "core/css/CSSValue.h"
 
 #include "core/css/CSSBorderImageSliceValue.h"
 #include "core/css/CSSCanvasValue.h"
 #include "core/css/CSSContentDistributionValue.h"
+#include "core/css/CSSCounterValue.h"
 #include "core/css/CSSCrossfadeValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSFontFaceSrcValue.h"
 #include "core/css/CSSFontFeatureValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGradientValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
 #include "core/css/CSSGridTemplateAreasValue.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/CSSImageValue.h"
@@ skipping 11 matching lines @@
 #include "core/css/CSSValueList.h"
 
 namespace blink {
 
 struct SameSizeAsCSSValue : public RefCountedWillBeGarbageCollectedFinalized<SameSizeAsCSSValue> {
     uint32_t bitfields;
 };
 
 static_assert(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), "CSSValue should stay small");
 
+typedef HashMap<const CSSValue*, String> CSSTextCache;
+static CSSTextCache& cssTextCache()
+{
+    AtomicallyInitializedStaticReference(ThreadSpecific<CSSTextCache>, cache, new ThreadSpecific<CSSTextCache>());
+    return *cache;
+}
+
 bool CSSValue::isImplicitInitialValue() const
 {
     return m_classType == InitialClass && toCSSInitialValue(this)->isImplicit();
 }
 
 bool CSSValue::hasFailedOrCanceledSubresources() const
 {
     if (isValueList())
         return toCSSValueList(this)->hasFailedOrCanceledSubresources();
     if (classType() == FontFaceSrcClass)
@@ skipping 15 matching lines @@
 }
 
 bool CSSValue::equals(const CSSValue& other) const
 {
     if (m_classType == other.m_classType) {
         switch (m_classType) {
         case BorderImageSliceClass:
             return compareCSSValues<CSSBorderImageSliceValue>(*this, other);
         case CanvasClass:
             return compareCSSValues<CSSCanvasValue>(*this, other);
+        case CounterClass:
+            return compareCSSValues<CSSCounterValue>(*this, other);
         case CursorImageClass:
             return compareCSSValues<CSSCursorImageValue>(*this, other);
         case FontFaceSrcClass:
             return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
         case FontFeatureClass:
             return compareCSSValues<CSSFontFeatureValue>(*this, other);
         case FunctionClass:
             return compareCSSValues<CSSFunctionValue>(*this, other);
         case LinearGradientClass:
             return compareCSSValues<CSSLinearGradientValue>(*this, other);
@@ skipping 40 matching lines @@
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
     }
     return false;
 }
 
 String CSSValue::cssText() const
 {
+    if (m_hasCachedCSSText) {
+        ASSERT(cssTextCache().contains(this));
+        return cssTextCache().get(this);
+    }
+
+    String text;

[Timothy Loh, 2015/08/21 07:33:12]

String CSSValue::uncachedCSSText() const { .. }?

[sashab, 2015/08/24 01:36:11]

Should I do this in CSSPrimitiveValue? Not sure how much nicer it'll make the
code. I guess it'll be a private method.

     switch (classType()) {
     case BorderImageSliceClass:
-        return toCSSBorderImageSliceValue(this)->customCSSText();
+        text = toCSSBorderImageSliceValue(this)->customCSSText();
+        break;
     case CanvasClass:
-        return toCSSCanvasValue(this)->customCSSText();
+        text = toCSSCanvasValue(this)->customCSSText();
+        break;
+    case CounterClass:
+        text = toCSSCounterValue(this)->customCSSText();
+        break;
     case CursorImageClass:
-        return toCSSCursorImageValue(this)->customCSSText();
+        text = toCSSCursorImageValue(this)->customCSSText();
+        break;
     case FontFaceSrcClass:
-        return toCSSFontFaceSrcValue(this)->customCSSText();
+        text = toCSSFontFaceSrcValue(this)->customCSSText();
+        break;
     case FontFeatureClass:
-        return toCSSFontFeatureValue(this)->customCSSText();
+        text = toCSSFontFeatureValue(this)->customCSSText();
+        break;
     case FunctionClass:
-        return toCSSFunctionValue(this)->customCSSText();
+        text = toCSSFunctionValue(this)->customCSSText();
+        break;
     case LinearGradientClass:
-        return toCSSLinearGradientValue(this)->customCSSText();
+        text = toCSSLinearGradientValue(this)->customCSSText();
+        break;
     case RadialGradientClass:
-        return toCSSRadialGradientValue(this)->customCSSText();
+        text = toCSSRadialGradientValue(this)->customCSSText();
+        break;
     case CrossfadeClass:
-        return toCSSCrossfadeValue(this)->customCSSText();
+        text = toCSSCrossfadeValue(this)->customCSSText();
+        break;
     case ImageClass:
-        return toCSSImageValue(this)->customCSSText();
+        text = toCSSImageValue(this)->customCSSText();
+        break;
     case InheritedClass:
-        return toCSSInheritedValue(this)->customCSSText();
+        text = toCSSInheritedValue(this)->customCSSText();
+        break;
     case UnsetClass:
-        return toCSSUnsetValue(this)->customCSSText();
+        text = toCSSUnsetValue(this)->customCSSText();
+        break;
     case InitialClass:
-        return toCSSInitialValue(this)->customCSSText();
+        text = toCSSInitialValue(this)->customCSSText();
+        break;
     case GridLineNamesClass:
-        return toCSSGridLineNamesValue(this)->customCSSText();
+        text = toCSSGridLineNamesValue(this)->customCSSText();
+        break;
     case GridTemplateAreasClass:
-        return toCSSGridTemplateAreasValue(this)->customCSSText();
+        text = toCSSGridTemplateAreasValue(this)->customCSSText();
+        break;
     case PathClass:
-        return toCSSPathValue(this)->customCSSText();
+        text = toCSSPathValue(this)->customCSSText();
+        break;
     case PrimitiveClass:
-        return toCSSPrimitiveValue(this)->customCSSText();
+        text = toCSSPrimitiveValue(this)->customCSSText();
+        break;
     case ReflectClass:
-        return toCSSReflectValue(this)->customCSSText();
+        text = toCSSReflectValue(this)->customCSSText();
+        break;
     case ShadowClass:
-        return toCSSShadowValue(this)->customCSSText();
+        text = toCSSShadowValue(this)->customCSSText();
+        break;
     case CubicBezierTimingFunctionClass:
-        return toCSSCubicBezierTimingFunctionValue(this)->customCSSText();
+        text = toCSSCubicBezierTimingFunctionValue(this)->customCSSText();
+        break;
     case StepsTimingFunctionClass:
-        return toCSSStepsTimingFunctionValue(this)->customCSSText();
+        text = toCSSStepsTimingFunctionValue(this)->customCSSText();
+        break;
     case UnicodeRangeClass:
-        return toCSSUnicodeRangeValue(this)->customCSSText();
+        text = toCSSUnicodeRangeValue(this)->customCSSText();
+        break;
     case ValueListClass:
-        return toCSSValueList(this)->customCSSText();
+        text = toCSSValueList(this)->customCSSText();
+        break;
     case LineBoxContainClass:
-        return toCSSLineBoxContainValue(this)->customCSSText();
+        text = toCSSLineBoxContainValue(this)->customCSSText();
+        break;
     case ImageSetClass:
-        return toCSSImageSetValue(this)->customCSSText();
+        text = toCSSImageSetValue(this)->customCSSText();
+        break;
     case CSSSVGDocumentClass:
-        return toCSSSVGDocumentValue(this)->customCSSText();
+        text = toCSSSVGDocumentValue(this)->customCSSText();
+        break;
     case CSSContentDistributionClass:
-        return toCSSContentDistributionValue(this)->customCSSText();
+        text = toCSSContentDistributionValue(this)->customCSSText();
+        break;
     }
-    ASSERT_NOT_REACHED();
-    return String();
+
+    ASSERT(!cssTextCache().contains(this));
+    cssTextCache().set(this, text);
+    m_hasCachedCSSText = true;
+    return text;
 }
 
 void CSSValue::destroy()
 {
+    if (m_hasCachedCSSText) {
+        cssTextCache().remove(this);
+        m_hasCachedCSSText = false;
+    }
+
     switch (classType()) {
     case BorderImageSliceClass:
         delete toCSSBorderImageSliceValue(this);
         return;
     case CanvasClass:
         delete toCSSCanvasValue(this);
         return;
+    case CounterClass:
+        delete toCSSCounterValue(this);
+        return;
     case CursorImageClass:
         delete toCSSCursorImageValue(this);
         return;
     case FontFaceSrcClass:
         delete toCSSFontFaceSrcValue(this);
         return;
     case FontFeatureClass:
         delete toCSSFontFeatureValue(this);
         return;
     case FunctionClass:
@@ skipping 68 matching lines @@
 
 void CSSValue::finalizeGarbageCollectedObject()
 {
     switch (classType()) {
     case BorderImageSliceClass:
         toCSSBorderImageSliceValue(this)->~CSSBorderImageSliceValue();
         return;
     case CanvasClass:
         toCSSCanvasValue(this)->~CSSCanvasValue();
         return;
+    case CounterClass:
+        toCSSCounterValue(this)->~CSSCounterValue();
+        return;
     case CursorImageClass:
         toCSSCursorImageValue(this)->~CSSCursorImageValue();
         return;
     case FontFaceSrcClass:
         toCSSFontFaceSrcValue(this)->~CSSFontFaceSrcValue();
         return;
     case FontFeatureClass:
         toCSSFontFeatureValue(this)->~CSSFontFeatureValue();
         return;
     case FunctionClass:
@@ skipping 68 matching lines @@
 
 DEFINE_TRACE(CSSValue)
 {
     switch (classType()) {
     case BorderImageSliceClass:
         toCSSBorderImageSliceValue(this)->traceAfterDispatch(visitor);
         return;
     case CanvasClass:
         toCSSCanvasValue(this)->traceAfterDispatch(visitor);
         return;
+    case CounterClass:
+        toCSSCounterValue(this)->traceAfterDispatch(visitor);
+        return;
     case CursorImageClass:
         toCSSCursorImageValue(this)->traceAfterDispatch(visitor);
         return;
     case FontFaceSrcClass:
         toCSSFontFaceSrcValue(this)->traceAfterDispatch(visitor);
         return;
     case FontFeatureClass:
         toCSSFontFeatureValue(this)->traceAfterDispatch(visitor);
         return;
     case FunctionClass:
@@ skipping 60 matching lines @@
         toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
         return;
     case CSSContentDistributionClass:
         toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
 }