CSSValue Immediates: Change CSSValue to an object instead of a pointer

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 38 matching lines @@
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSUnsetValue.h"
 #include "core/css/CSSValueList.h"
 
 namespace blink {
 
-struct SameSizeAsCSSValue : public RefCountedWillBeGarbageCollectedFinalized<SameSizeAsCSSValue>
+struct SameSizeAsCSSValueObject : public RefCountedWillBeGarbageCollectedFinalized<SameSizeAsCSSValueObject>
 {
     uint32_t bitfields;
 };
 
-static_assert(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), "CSSValue should stay small");
+static_assert(sizeof(CSSValueObject) <= sizeof(SameSizeAsCSSValueObject), "CSSValCSSValueObjectue should stay small");
 
-bool CSSValue::isImplicitInitialValue() const
+bool CSSValueObject::isImplicitInitialValue() const
 {
     return m_classType == InitialClass && toCSSInitialValue(this)->isImplicit();
 }
 
-bool CSSValue::hasFailedOrCanceledSubresources() const
+bool CSSValueObject::hasFailedOrCanceledSubresources() const
 {
     if (isValueList())
         return toCSSValueList(this)->hasFailedOrCanceledSubresources();
     if (classType() == FontFaceSrcClass)
         return toCSSFontFaceSrcValue(this)->hasFailedOrCanceledSubresources();
     if (classType() == ImageClass)
         return toCSSImageValue(this)->hasFailedOrCanceledSubresources();
     if (classType() == CrossfadeClass)
         return toCSSCrossfadeValue(this)->hasFailedOrCanceledSubresources();
     if (classType() == ImageSetClass)
         return toCSSImageSetValue(this)->hasFailedOrCanceledSubresources();
 
     return false;
 }
 
 template<class ChildClassType>
-inline static bool compareCSSValues(const CSSValue& first, const CSSValue& second)
+inline static bool compareCSSValues(const CSSValueObject& first, const CSSValueObject& second)
 {
     return static_cast<const ChildClassType&>(first).equals(static_cast<const ChildClassType&>(second));
 }
 
-bool CSSValue::equals(const CSSValue& other) const
+bool CSSValueObject::equals(const CSSValueObject& 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 CursorImageClass:
             return compareCSSValues<CSSCursorImageValue>(*this, other);
         case FontFaceSrcClass:
@@ skipping 47 matching lines @@
         case CSSContentDistributionClass:
             return compareCSSValues<CSSContentDistributionValue>(*this, other);
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
     }
     return false;
 }
 
-String CSSValue::cssText() const
+String CSSValueObject::cssText() const
 {
     switch (classType()) {
     case BorderImageSliceClass:
         return toCSSBorderImageSliceValue(this)->customCSSText();
     case CanvasClass:
         return toCSSCanvasValue(this)->customCSSText();
     case CursorImageClass:
         return toCSSCursorImageValue(this)->customCSSText();
     case FontFaceSrcClass:
         return toCSSFontFaceSrcValue(this)->customCSSText();
@@ skipping 43 matching lines @@
         return toCSSImageSetValue(this)->customCSSText();
     case CSSSVGDocumentClass:
         return toCSSSVGDocumentValue(this)->customCSSText();
     case CSSContentDistributionClass:
         return toCSSContentDistributionValue(this)->customCSSText();
     }
     ASSERT_NOT_REACHED();
     return String();
 }
 
-void CSSValue::destroy()
+void CSSValueObject::destroy()
 {
     switch (classType()) {
     case BorderImageSliceClass:
         delete toCSSBorderImageSliceValue(this);
         return;
     case CanvasClass:
         delete toCSSCanvasValue(this);
         return;
     case CursorImageClass:
         delete toCSSCursorImageValue(this);
@@ skipping 70 matching lines @@
     case CSSSVGDocumentClass:
         delete toCSSSVGDocumentValue(this);
         return;
     case CSSContentDistributionClass:
         delete toCSSContentDistributionValue(this);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
-void CSSValue::finalizeGarbageCollectedObject()
+void CSSValueObject::finalizeGarbageCollectedObject()
 {
     switch (classType()) {
     case BorderImageSliceClass:
         toCSSBorderImageSliceValue(this)->~CSSBorderImageSliceValue();
         return;
     case CanvasClass:
         toCSSCanvasValue(this)->~CSSCanvasValue();
         return;
     case CursorImageClass:
         toCSSCursorImageValue(this)->~CSSCursorImageValue();
@@ skipping 70 matching lines @@
     case CSSSVGDocumentClass:
         toCSSSVGDocumentValue(this)->~CSSSVGDocumentValue();
         return;
     case CSSContentDistributionClass:
         toCSSContentDistributionValue(this)->~CSSContentDistributionValue();
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
-DEFINE_TRACE(CSSValue)
+DEFINE_TRACE(CSSValueObject)
 {
     switch (classType()) {
     case BorderImageSliceClass:
         toCSSBorderImageSliceValue(this)->traceAfterDispatch(visitor);
         return;
     case CanvasClass:
         toCSSCanvasValue(this)->traceAfterDispatch(visitor);
         return;
     case CursorImageClass:
         toCSSCursorImageValue(this)->traceAfterDispatch(visitor);
@@ skipping 70 matching lines @@
     case CSSSVGDocumentClass:
         toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
         return;
     case CSSContentDistributionClass:
         toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
+DEFINE_TRACE(NullableCSSValue)
+{
+    if (m_data)
+        visitor->trace(*m_data);
 }
+
+DEFINE_TRACE(CSSValue)
+{
+    ASSERT(m_data);
+    visitor->trace(*m_data);
+}
+
+}