CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/resolver/ViewportStyleResolver.cpp

 /*
  * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
  *
  * 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.
@@ skipping 123 matching lines @@
     // UserZoom default value is CSSValueZoom, which maps to true, meaning that
     // yes, it is user scalable. When the value is set to CSSValueFixed, we
     // return false.
     if (id == CSSPropertyUserZoom)
         defaultValue = 1;
 
     NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
     if (!value || !value->isPrimitiveValue())
         return defaultValue;
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(*value);
 
-    if (primitiveValue->isNumber() || primitiveValue->isPx())
-        return primitiveValue->getFloatValue();
+    if (primitiveValue.isNumber() || primitiveValue.isPx())
+        return primitiveValue.getFloatValue();
 
-    if (primitiveValue->isFontRelativeLength())
-        return primitiveValue->getFloatValue() * m_document->computedStyle()->fontDescription().computedSize();
+    if (primitiveValue.isFontRelativeLength())
+        return primitiveValue.getFloatValue() * m_document->computedStyle()->fontDescription().computedSize();
 
-    if (primitiveValue->isPercentage()) {
-        float percentValue = primitiveValue->getFloatValue() / 100.0f;
+    if (primitiveValue.isPercentage()) {
+        float percentValue = primitiveValue.getFloatValue() / 100.0f;
         switch (id) {
         case CSSPropertyMaxZoom:
         case CSSPropertyMinZoom:
         case CSSPropertyZoom:
             return percentValue;
         default:
             ASSERT_NOT_REACHED();
             break;
         }
     }
 
-    switch (primitiveValue->getValueID()) {
+    switch (primitiveValue.getValueID()) {
     case CSSValueAuto:
         return defaultValue;
     case CSSValueLandscape:
         return ViewportDescription::ValueLandscape;
     case CSSValuePortrait:
         return ViewportDescription::ValuePortrait;
     case CSSValueZoom:
         return defaultValue;
     case CSSValueInternalExtendToZoom:
         return ViewportDescription::ValueExtendToZoom;
     case CSSValueFixed:
         return 0;
     default:
         return defaultValue;
     }
 }
 
 Length ViewportStyleResolver::viewportLengthValue(CSSPropertyID id) const
 {
     ASSERT(id == CSSPropertyMaxHeight
         || id == CSSPropertyMinHeight
         || id == CSSPropertyMaxWidth
         || id == CSSPropertyMinWidth);
 
     NullableCSSValue value = m_propertySet->getPropertyCSSValue(id);
     if (!value || !value->isPrimitiveValue())
         return Length(); // auto
 
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+    CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(*value);
 
-    if (primitiveValue->getValueID() == CSSValueInternalExtendToZoom)
+    if (primitiveValue.getValueID() == CSSValueInternalExtendToZoom)
         return Length(ExtendToZoom);
 
     ComputedStyle* documentStyle = m_document->mutableComputedStyle();
 
     // If we have viewport units the conversion will mark the document style as having viewport units.
     bool documentStyleHasViewportUnits = documentStyle->hasViewportUnits();
     documentStyle->setHasViewportUnits(false);
 
     FrameView* view = m_document->view();
     float width = view ? view->width() : 0;
     float height = view ? view->height() : 0;
 
     CSSToLengthConversionData::FontSizes fontSizes(documentStyle, documentStyle);
     CSSToLengthConversionData::ViewportSize viewportSize(width, height);
 
-    if (primitiveValue->getValueID() == CSSValueAuto)
+    if (primitiveValue.getValueID() == CSSValueAuto)
         return Length(Auto);
 
-    Length result = primitiveValue->convertToLength(CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
+    Length result = primitiveValue.convertToLength(CSSToLengthConversionData(documentStyle, fontSizes, viewportSize, 1.0f));
     if (documentStyle->hasViewportUnits())
         m_document->setHasViewportUnits();
     documentStyle->setHasViewportUnits(documentStyleHasViewportUnits);
 
     return result;
 }
 
 DEFINE_TRACE(ViewportStyleResolver)
 {
     visitor->trace(m_propertySet);
     visitor->trace(m_document);
 }
 
 } // namespace blink