CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/CSSValueObject.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 44 matching lines @@
 #include "core/css/CSSValueList.h"
 
 namespace blink {
 
 struct SameSizeAsCSSValueObject : public RefCountedWillBeGarbageCollectedFinalized<SameSizeAsCSSValueObject> {
     uint32_t bitfields;
 };
 
 static_assert(sizeof(CSSValueObject) <= sizeof(SameSizeAsCSSValueObject), "CSSValueObject should stay small");
 
+// Only for use by CSSValueObject.
+inline CSSPrimitiveValue::CSSLargePrimitiveValue* toCSSLargePrimitiveValue(CSSValueObject* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue());
+    return static_cast<CSSPrimitiveValue::CSSLargePrimitiveValue*>(value);
+}
+inline CSSPrimitiveValue toCSSPrimitiveValue(const CSSValueObject* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue());
+    return CSSPrimitiveValue(static_cast<const CSSPrimitiveValue::CSSLargePrimitiveValue*>(value));
+}
+
 bool CSSValueObject::isImplicitInitialValue() const
 {
     return m_classType == InitialClass && toCSSInitialValue(this)->isImplicit();
 }
 
 bool CSSValueObject::hasFailedOrCanceledSubresources() const
 {
     if (isValueList())
         return toCSSValueList(this)->hasFailedOrCanceledSubresources();
     if (classType() == FontFaceSrcClass)
@@ skipping 44 matching lines @@
             return compareCSSValues<CSSInitialValue>(*this, other);
         case UnsetClass:
             return compareCSSValues<CSSUnsetValue>(*this, other);
         case GridLineNamesClass:
             return compareCSSValues<CSSGridLineNamesValue>(*this, other);
         case GridTemplateAreasClass:
             return compareCSSValues<CSSGridTemplateAreasValue>(*this, other);
         case PathClass:
             return compareCSSValues<CSSPathValue>(*this, other);
         case PrimitiveClass:
-            return compareCSSValues<CSSPrimitiveValue>(*this, other);
+            return toCSSPrimitiveValue(this).equals(toCSSPrimitiveValue(&other));
         case ReflectClass:
             return compareCSSValues<CSSReflectValue>(*this, other);
         case ShadowClass:
             return compareCSSValues<CSSShadowValue>(*this, other);
         case CubicBezierTimingFunctionClass:
             return compareCSSValues<CSSCubicBezierTimingFunctionValue>(*this, other);
         case StepsTimingFunctionClass:
             return compareCSSValues<CSSStepsTimingFunctionValue>(*this, other);
         case UnicodeRangeClass:
             return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
@@ skipping 46 matching lines @@
         return toCSSUnsetValue(this)->customCSSText();
     case InitialClass:
         return toCSSInitialValue(this)->customCSSText();
     case GridLineNamesClass:
         return toCSSGridLineNamesValue(this)->customCSSText();
     case GridTemplateAreasClass:
         return toCSSGridTemplateAreasValue(this)->customCSSText();
     case PathClass:
         return toCSSPathValue(this)->customCSSText();
     case PrimitiveClass:
-        return toCSSPrimitiveValue(this)->customCSSText();
+        return toCSSPrimitiveValue(this).customCSSText();
     case ReflectClass:
         return toCSSReflectValue(this)->customCSSText();
     case ShadowClass:
         return toCSSShadowValue(this)->customCSSText();
     case CubicBezierTimingFunctionClass:
         return toCSSCubicBezierTimingFunctionValue(this)->customCSSText();
     case StepsTimingFunctionClass:
         return toCSSStepsTimingFunctionValue(this)->customCSSText();
     case UnicodeRangeClass:
         return toCSSUnicodeRangeValue(this)->customCSSText();
@@ skipping 59 matching lines @@
     case GridLineNamesClass:
         delete toCSSGridLineNamesValue(this);
         return;
     case GridTemplateAreasClass:
         delete toCSSGridTemplateAreasValue(this);
         return;
     case PathClass:
         delete toCSSPathValue(this);
         return;
     case PrimitiveClass:
-        delete toCSSPrimitiveValue(this);
+        delete toCSSLargePrimitiveValue(this);
         return;
     case ReflectClass:
         delete toCSSReflectValue(this);
         return;
     case ShadowClass:
         delete toCSSShadowValue(this);
         return;
     case CubicBezierTimingFunctionClass:
         delete toCSSCubicBezierTimingFunctionValue(this);
         return;
@@ skipping 70 matching lines @@
     case GridLineNamesClass:
         toCSSGridLineNamesValue(this)->~CSSGridLineNamesValue();
         return;
     case GridTemplateAreasClass:
         toCSSGridTemplateAreasValue(this)->~CSSGridTemplateAreasValue();
         return;
     case PathClass:
         toCSSPathValue(this)->~CSSPathValue();
         return;
     case PrimitiveClass:
-        toCSSPrimitiveValue(this)->~CSSPrimitiveValue();
+        toCSSLargePrimitiveValue(this)->~CSSLargePrimitiveValue();
         return;
     case ReflectClass:
         toCSSReflectValue(this)->~CSSReflectValue();
         return;
     case ShadowClass:
         toCSSShadowValue(this)->~CSSShadowValue();
         return;
     case CubicBezierTimingFunctionClass:
         toCSSCubicBezierTimingFunctionValue(this)->~CSSCubicBezierTimingFunctionValue();
         return;
@@ skipping 70 matching lines @@
     case GridLineNamesClass:
         toCSSGridLineNamesValue(this)->traceAfterDispatch(visitor);
         return;
     case GridTemplateAreasClass:
         toCSSGridTemplateAreasValue(this)->traceAfterDispatch(visitor);
         return;
     case PathClass:
         toCSSPathValue(this)->traceAfterDispatch(visitor);
         return;
     case PrimitiveClass:
-        toCSSPrimitiveValue(this)->traceAfterDispatch(visitor);
+        toCSSLargePrimitiveValue(this)->traceAfterDispatch(visitor);
         return;
     case ReflectClass:
         toCSSReflectValue(this)->traceAfterDispatch(visitor);
         return;
     case ShadowClass:
         toCSSShadowValue(this)->traceAfterDispatch(visitor);
         return;
     case CubicBezierTimingFunctionClass:
         toCSSCubicBezierTimingFunctionValue(this)->traceAfterDispatch(visitor);
         return;
@@ skipping 19 matching lines @@
         toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
         return;
     case CSSContentDistributionClass:
         toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
 }