CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/css/CSSBasicShapes.cpp

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. 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 51 matching lines @@
     result.append(')');
     if (box.length()) {
         result.appendLiteral(separator);
         result.append(box);
     }
     return result.toString();
 }
 
 static String serializePositionOffset(const Pair& offset, const Pair& other)
 {
-    if ((offset.first()->getValueID() == CSSValueLeft && other.first()->getValueID() == CSSValueTop)
-        || (offset.first()->getValueID() == CSSValueTop && other.first()->getValueID() == CSSValueLeft))
+    if ((toCSSPrimitiveValue(*offset.first()).getValueID() == CSSValueLeft && toCSSPrimitiveValue(*other.first()).getValueID() == CSSValueTop)
+        || (toCSSPrimitiveValue(*offset.first()).getValueID() == CSSValueTop && toCSSPrimitiveValue(*other.first()).getValueID() == CSSValueLeft))
         return offset.second()->cssText();
     return offset.cssText();
 }
 
-static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> buildSerializablePositionOffset(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> offset, CSSValueID defaultSide)
+static CSSPrimitiveValue buildSerializablePositionOffset(NullableCSSValue offset, CSSValueID defaultSide)
 {
     CSSValueID side = defaultSide;
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> amount = nullptr;
+    NullableCSSValue amount;
 
     if (!offset) {
         side = CSSValueCenter;
-    } else if (offset->isValueID()) {
-        side = offset->getValueID();
-    } else if (Pair* pair = offset->getPairValue()) {
-        side = pair->first()->getValueID();
+    } else if (toCSSPrimitiveValue(*offset).isValueID()) {
+        side = toCSSPrimitiveValue(*offset).getValueID();
+    } else if (Pair* pair = toCSSPrimitiveValue(*offset).getPairValue()) {
+        side = toCSSPrimitiveValue(*pair->first()).getValueID();
         amount = pair->second();
     } else {
         amount = offset;
     }
 
     if (side == CSSValueCenter) {
         side = defaultSide;
         amount = cssValuePool().createValue(50, CSSPrimitiveValue::CSS_PERCENTAGE);
     } else if ((side == CSSValueRight || side == CSSValueBottom)
-        && amount->isPercentage()) {
+        && toCSSPrimitiveValue(*amount).isPercentage()) {
         side = defaultSide;
-        amount = cssValuePool().createValue(100 - amount->getFloatValue(), CSSPrimitiveValue::CSS_PERCENTAGE);
-    } else if (amount->isLength() && !amount->getFloatValue()) {
+        amount = cssValuePool().createValue(100 - toCSSPrimitiveValue(*amount).getFloatValue(), CSSPrimitiveValue::CSS_PERCENTAGE);
+    } else if (toCSSPrimitiveValue(*amount).isLength() && !toCSSPrimitiveValue(*amount).getFloatValue()) {
         if (side == CSSValueRight || side == CSSValueBottom)
             amount = cssValuePool().createValue(100, CSSPrimitiveValue::CSS_PERCENTAGE);
         else
             amount = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PERCENTAGE);
         side = defaultSide;
     }
 
-    return cssValuePool().createValue(Pair::create(cssValuePool().createValue(side), amount.release(), Pair::KeepIdenticalValues));
+    return cssValuePool().createValue(Pair::create(cssValuePool().createValue(side), toCSSPrimitiveValue(*amount), Pair::KeepIdenticalValues));
 }
 
 String CSSBasicShapeCircle::cssText() const
 {
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
+    CSSPrimitiveValue normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
+    CSSPrimitiveValue normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
 
     String radius;
-    if (m_radius && m_radius->getValueID() != CSSValueClosestSide)
+    if (m_radius && toCSSPrimitiveValue(*m_radius).getValueID() != CSSValueClosestSide)
         radius = m_radius->cssText();
 
     return buildCircleString(radius,
-        serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
-        serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
+        serializePositionOffset(*normalizedCX.getPairValue(), *normalizedCY.getPairValue()),
+        serializePositionOffset(*normalizedCY.getPairValue(), *normalizedCX.getPairValue()),
         m_referenceBox ? m_referenceBox->cssText() : String());
 }
 
 bool CSSBasicShapeCircle::equals(const CSSBasicShape& shape) const
 {
     if (shape.type() != CSSBasicShapeCircleType)
         return false;
 
     const CSSBasicShapeCircle& other = toCSSBasicShapeCircle(shape);
-    return compareCSSValuePtr(m_centerX, other.m_centerX)
-        && compareCSSValuePtr(m_centerY, other.m_centerY)
-        && compareCSSValuePtr(m_radius, other.m_radius)
-        && compareCSSValuePtr(m_referenceBox, other.m_referenceBox);
+    return m_centerX == other.m_centerX
+        && m_centerY == other.m_centerY
+        && m_radius == other.m_radius
+        && m_referenceBox == other.m_referenceBox;
 }
 
 DEFINE_TRACE(CSSBasicShapeCircle)
 {
     visitor->trace(m_centerX);
     visitor->trace(m_centerY);
     visitor->trace(m_radius);
     CSSBasicShape::trace(visitor);
 }
 
@@ skipping 27 matching lines @@
     result.append(')');
     if (box.length()) {
         result.appendLiteral(separator);
         result.append(box);
     }
     return result.toString();
 }
 
 String CSSBasicShapeEllipse::cssText() const
 {
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
+    CSSPrimitiveValue normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
+    CSSPrimitiveValue normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
 
     String radiusX;
     String radiusY;
     if (m_radiusX) {
-        bool shouldSerializeRadiusXValue = m_radiusX->getValueID() != CSSValueClosestSide;
+        bool shouldSerializeRadiusXValue = toCSSPrimitiveValue(*m_radiusX).getValueID() != CSSValueClosestSide;
         bool shouldSerializeRadiusYValue = false;
 
         if (m_radiusY) {
-            shouldSerializeRadiusYValue = m_radiusY->getValueID() != CSSValueClosestSide;
+            shouldSerializeRadiusYValue = toCSSPrimitiveValue(*m_radiusY).getValueID() != CSSValueClosestSide;
             if (shouldSerializeRadiusYValue)
                 radiusY = m_radiusY->cssText();
         }
         if (shouldSerializeRadiusXValue || (!shouldSerializeRadiusXValue && shouldSerializeRadiusYValue))
             radiusX = m_radiusX->cssText();
     }
 
     return buildEllipseString(radiusX, radiusY,
-        serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
-        serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
+        serializePositionOffset(*normalizedCX.getPairValue(), *normalizedCY.getPairValue()),
+        serializePositionOffset(*normalizedCY.getPairValue(), *normalizedCX.getPairValue()),
         m_referenceBox ? m_referenceBox->cssText() : String());
 }
 
 bool CSSBasicShapeEllipse::equals(const CSSBasicShape& shape) const
 {
     if (shape.type() != CSSBasicShapeEllipseType)
         return false;
 
     const CSSBasicShapeEllipse& other = toCSSBasicShapeEllipse(shape);
-    return compareCSSValuePtr(m_centerX, other.m_centerX)
-        && compareCSSValuePtr(m_centerY, other.m_centerY)
-        && compareCSSValuePtr(m_radiusX, other.m_radiusX)
-        && compareCSSValuePtr(m_radiusY, other.m_radiusY)
-        && compareCSSValuePtr(m_referenceBox, other.m_referenceBox);
+    return m_centerX == other.m_centerX
+        && m_centerY == other.m_centerY
+        && m_radiusX == other.m_radiusX
+        && m_radiusY == other.m_radiusY
+        && m_referenceBox == other.m_referenceBox;
 }
 
 DEFINE_TRACE(CSSBasicShapeEllipse)
 {
     visitor->trace(m_centerX);
     visitor->trace(m_centerY);
     visitor->trace(m_radiusX);
     visitor->trace(m_radiusY);
     CSSBasicShape::trace(visitor);
 }
@@ skipping 42 matching lines @@
 
     return result.toString();
 }
 
 String CSSBasicShapePolygon::cssText() const
 {
     Vector<String> points;
     points.reserveInitialCapacity(m_values.size());
 
     for (size_t i = 0; i < m_values.size(); ++i)
-        points.append(m_values.at(i)->cssText());
+        points.append(m_values.at(i).cssText());
 
     return buildPolygonString(m_windRule, points, m_referenceBox ? m_referenceBox->cssText() : String());
 }
 
 bool CSSBasicShapePolygon::equals(const CSSBasicShape& shape) const
 {
     if (shape.type() != CSSBasicShapePolygonType)
         return false;
 
     const CSSBasicShapePolygon& rhs = toCSSBasicShapePolygon(shape);
 
-    if (!compareCSSValuePtr(m_referenceBox, rhs.m_referenceBox))
+    if (m_referenceBox != rhs.m_referenceBox)
         return false;
 
-    return compareCSSValueObjectVector(m_values, rhs.m_values);
+    return compareCSSValueVector(m_values, rhs.m_values);
 }
 
 DEFINE_TRACE(CSSBasicShapePolygon)
 {
     visitor->trace(m_values);
     CSSBasicShape::trace(visitor);
 }
 
 static bool buildInsetRadii(Vector<String> &radii, const String& topLeftRadius, const String& topRightRadius, const String& bottomRightRadius, const String& bottomLeftRadius)
 {
@@ skipping 64 matching lines @@
                     result.append(verticalRadii[i]);
                 }
             }
         }
     }
     result.append(')');
 
     return result.toString();
 }
 
-static inline void updateCornerRadiusWidthAndHeight(CSSPrimitiveValue* corner, String& width, String& height)
+static inline void updateCornerRadiusWidthAndHeight(NullableCSSValue corner, String& width, String& height)
 {
     if (!corner)
         return;
 
-    Pair* radius = corner->getPairValue();
+    Pair* radius = toCSSPrimitiveValue(*corner).getPairValue();
     width = radius->first() ? radius->first()->cssText() : String("0");
     if (radius->second())
         height = radius->second()->cssText();
 }
 
 String CSSBasicShapeInset::cssText() const
 {
     String topLeftRadiusWidth;
     String topLeftRadiusHeight;
     String topRightRadiusWidth;
@@ skipping 21 matching lines @@
         bottomLeftRadiusWidth,
         bottomLeftRadiusHeight);
 }
 
 bool CSSBasicShapeInset::equals(const CSSBasicShape& shape) const
 {
     if (shape.type() != CSSBasicShapeInsetType)
         return false;
 
     const CSSBasicShapeInset& other = toCSSBasicShapeInset(shape);
-    return compareCSSValuePtr(m_top, other.m_top)
-        && compareCSSValuePtr(m_right, other.m_right)
-        && compareCSSValuePtr(m_bottom, other.m_bottom)
-        && compareCSSValuePtr(m_left, other.m_left)
-        && compareCSSValuePtr(m_topLeftRadius, other.m_topLeftRadius)
-        && compareCSSValuePtr(m_topRightRadius, other.m_topRightRadius)
-        && compareCSSValuePtr(m_bottomRightRadius, other.m_bottomRightRadius)
-        && compareCSSValuePtr(m_bottomLeftRadius, other.m_bottomLeftRadius);
+    return m_top == other.m_top
+        && m_right == other.m_right
+        && m_bottom == other.m_bottom
+        && m_left == other.m_left
+        && m_topLeftRadius == other.m_topLeftRadius
+        && m_topRightRadius == other.m_topRightRadius
+        && m_bottomRightRadius == other.m_bottomRightRadius
+        && m_bottomLeftRadius == other.m_bottomLeftRadius;
 }
 
 DEFINE_TRACE(CSSBasicShapeInset)
 {
     visitor->trace(m_top);
     visitor->trace(m_right);
     visitor->trace(m_bottom);
     visitor->trace(m_left);
     visitor->trace(m_topLeftRadius);
     visitor->trace(m_topRightRadius);
     visitor->trace(m_bottomRightRadius);
     visitor->trace(m_bottomLeftRadius);
     CSSBasicShape::trace(visitor);
 }
 
 } // namespace blink