CSSValue Immediates: Make CSSPrimitiveValue store a tagged pointer

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 928 matching lines @@
     case CSS_CALC_PERCENTAGE_WITH_LENGTH:
     case CSS_QEM:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
 {
-    if (hasCachedCSSText()) {
-        ASSERT(cssTextCache().contains(m_rawValue));
-        return cssTextCache().get(m_rawValue);
+    if (!isObject() && cssTextCache().contains(m_rawValue.asPtr))
+        return cssTextCache().get(m_rawValue.asPtr);
+
+    if (isObject() && m_rawValue.asPtr->m_hasCachedCSSText) {
+        ASSERT(cssTextCache().contains(m_rawValue.asPtr));
+        return cssTextCache().get(m_rawValue.asPtr);
     }
 
     String text;
     switch (type()) {
         case CSS_UNKNOWN:
             // FIXME
             break;
         case CSS_INTEGER:
             text = String::format("%d", getIntValue());
             break;
@@ skipping 93 matching lines @@
         case CSS_CALC:
             text = value().calc->cssText();
             break;
         case CSS_SHAPE:
             text = value().shape->cssText();
             break;
         default:
             break;
     }
 
-    ASSERT(!cssTextCache().contains(m_rawValue));
-    cssTextCache().set(m_rawValue, text);
-    setHasCachedCSSText(true);
+    ASSERT(!cssTextCache().contains(m_rawValue.asPtr));
+    cssTextCache().set(m_rawValue.asPtr, text);
+    if (isObject())
+        m_rawValue.asPtr->m_hasCachedCSSText = true;
     return text;
 }
 
 bool CSSPrimitiveValue::equals(const CSSPrimitiveValue other) const
 {
     if (type() != other.type())
         return false;
 
     switch (type()) {
     case CSS_UNKNOWN:
@@ skipping 78 matching lines @@
         visitor->trace(m_value.shape);
         break;
     default:
         break;
     }
 #endif
     CSSValueObject::traceAfterDispatch(visitor);
 }
 
 } // namespace blink