Changed Pair to be a CSSValue

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 12 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/CSSBasicShapes.h"
 
+#include "core/css/CSSValuePair.h"
 #include "core/css/CSSValuePool.h"
-#include "core/css/Pair.h"
 #include "platform/Length.h"
 #include "wtf/text/StringBuilder.h"
 
 using namespace WTF;
 
 namespace blink {
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CSSBasicShape)
 
 static String buildCircleString(const String& radius, const String& centerX, const String& centerY, const String& box)
@@ skipping 15 matching lines @@
         result.append(centerY);
     }
     result.append(')');
     if (box.length()) {
         result.appendLiteral(separator);
         result.append(box);
     }
     return result.toString();
 }
 
-static String serializePositionOffset(const Pair& offset, const Pair& other)
+static String serializePositionOffset(const CSSValuePair& offset, const CSSValuePair& 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 PassRefPtrWillBeRawPtr<CSSValuePair> buildSerializablePositionOffset(PassRefPtrWillBeRawPtr<CSSValue> offset, CSSValueID defaultSide)
 {
     CSSValueID side = defaultSide;
     RefPtrWillBeRawPtr<CSSPrimitiveValue> amount = nullptr;
 
     if (!offset) {
         side = CSSValueCenter;
-    } else if (offset->isValueID()) {
-        side = offset->getValueID();
-    } else if (Pair* pair = offset->getPairValue()) {
-        side = pair->first()->getValueID();
-        amount = pair->second();
+    } else if (offset->isPrimitiveValue() && toCSSPrimitiveValue(offset.get())->isValueID()) {
+        side = toCSSPrimitiveValue(offset.get())->getValueID();
+    } else if (offset->isValuePair()) {
+        side = toCSSPrimitiveValue(toCSSValuePair(offset.get())->first())->getValueID();
+        amount = toCSSPrimitiveValue(toCSSValuePair(offset.get())->second());
     } else {
-        amount = offset;
+        amount = toCSSPrimitiveValue(offset.get());
     }
 
     if (side == CSSValueCenter) {
         side = defaultSide;
         amount = cssValuePool().createValue(50, CSSPrimitiveValue::UnitType::Percentage);
     } else if ((side == CSSValueRight || side == CSSValueBottom)
         && amount->isPercentage()) {
         side = defaultSide;
         amount = cssValuePool().createValue(100 - amount->getFloatValue(), CSSPrimitiveValue::UnitType::Percentage);
     } else if (amount->isLength() && !amount->getFloatValue()) {
         if (side == CSSValueRight || side == CSSValueBottom)
             amount = cssValuePool().createValue(100, CSSPrimitiveValue::UnitType::Percentage);
         else
             amount = cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Percentage);
         side = defaultSide;
     }
 
-    return cssValuePool().createValue(Pair::create(cssValuePool().createValue(side), amount.release(), Pair::KeepIdenticalValues));
+    return CSSValuePair::create(cssValuePool().createValue(side), amount.release(), CSSValuePair::KeepIdenticalValues);
 }
 
 String CSSBasicShapeCircle::cssText() const
 {
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
+    RefPtrWillBeRawPtr<CSSValuePair> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
+    RefPtrWillBeRawPtr<CSSValuePair> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
 
     String radius;
     if (m_radius && m_radius->getValueID() != CSSValueClosestSide)
         radius = m_radius->cssText();
 
     return buildCircleString(radius,
-        serializePositionOffset(*normalizedCX->getPairValue(), *normalizedCY->getPairValue()),
-        serializePositionOffset(*normalizedCY->getPairValue(), *normalizedCX->getPairValue()),
+        serializePositionOffset(*normalizedCX, *normalizedCY),
+        serializePositionOffset(*normalizedCY, *normalizedCX),
         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)
@@ skipping 40 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);
+    RefPtrWillBeRawPtr<CSSValuePair> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft);
+    RefPtrWillBeRawPtr<CSSValuePair> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop);
 
     String radiusX;
     String radiusY;
     if (m_radiusX) {
         bool shouldSerializeRadiusXValue = m_radiusX->getValueID() != CSSValueClosestSide;
         bool shouldSerializeRadiusYValue = false;
 
         if (m_radiusY) {
             shouldSerializeRadiusYValue = 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, *normalizedCY),
+        serializePositionOffset(*normalizedCY, *normalizedCX),
         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)
@@ skipping 156 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(CSSValuePair* cornerRadius, String& width, String& height)
 {
-    if (!corner)
+    if (!cornerRadius)
         return;
 
-    Pair* radius = corner->getPairValue();
-    width = radius->first() ? radius->first()->cssText() : String("0");
-    if (radius->second())
-        height = radius->second()->cssText();
+    width = cornerRadius->first() ? cornerRadius->first()->cssText() : String("0");
+    if (cornerRadius->second())
+        height = cornerRadius->second()->cssText();
 }
 
 String CSSBasicShapeInset::cssText() const
 {
     String topLeftRadiusWidth;
     String topLeftRadiusHeight;
     String topRightRadiusWidth;
     String topRightRadiusHeight;
     String bottomRightRadiusWidth;
     String bottomRightRadiusHeight;
@@ skipping 43 matching lines @@
     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