Revert of Evacuate ComputedStyle references from the CSS*Value hierarchy

third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

 /*
  * Copyright (C) 2012 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 23 matching lines @@
 #include "core/css/CSSValuePair.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/BasicShapes.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
 static CSSValue* valueForCenterCoordinate(const ComputedStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)
 {
     if (center.getDirection() == BasicShapeCenterCoordinate::TopLeft)
-        return CSSPrimitiveValue::create(center.length(), style.effectiveZoom());
+        return CSSPrimitiveValue::create(center.length(), style);
 
     CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBottom;
 
-    return CSSValuePair::create(
-        CSSPrimitiveValue::createIdentifier(keyword),
-        CSSPrimitiveValue::create(center.length(), style.effectiveZoom()),
-        CSSValuePair::DropIdenticalValues);
-}
-
-static CSSValuePair* valueForLengthSize(const LengthSize& lengthSize, const ComputedStyle& style)
-{
-    return CSSValuePair::create(
-        CSSPrimitiveValue::create(lengthSize.width(), style.effectiveZoom()),
-        CSSPrimitiveValue::create(lengthSize.height(), style.effectiveZoom()),
-        CSSValuePair::KeepIdenticalValues);
+    return CSSValuePair::create(CSSPrimitiveValue::createIdentifier(keyword), CSSPrimitiveValue::create(center.length(), style), CSSValuePair::DropIdenticalValues);
 }
 
 static CSSPrimitiveValue* basicShapeRadiusToCSSValue(const ComputedStyle& style, const BasicShapeRadius& radius)
 {
     switch (radius.type()) {
     case BasicShapeRadius::Value:
-        return CSSPrimitiveValue::create(radius.value(), style.effectiveZoom());
+        return CSSPrimitiveValue::create(radius.value(), style);
     case BasicShapeRadius::ClosestSide:
         return CSSPrimitiveValue::createIdentifier(CSSValueClosestSide);
     case BasicShapeRadius::FarthestSide:
         return CSSPrimitiveValue::createIdentifier(CSSValueFarthestSide);
     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
@@ skipping 18 matching lines @@
         ellipseValue->setRadiusX(basicShapeRadiusToCSSValue(style, ellipse->radiusX()));
         ellipseValue->setRadiusY(basicShapeRadiusToCSSValue(style, ellipse->radiusY()));
         return ellipseValue;
     }
     case BasicShape::BasicShapePolygonType: {
         const BasicShapePolygon* polygon = toBasicShapePolygon(basicShape);
         CSSBasicShapePolygonValue* polygonValue = CSSBasicShapePolygonValue::create();
 
         polygonValue->setWindRule(polygon->getWindRule());
         const Vector<Length>& values = polygon->values();
-        for (unsigned i = 0; i < values.size(); i += 2) {
-            polygonValue->appendPoint(
-                CSSPrimitiveValue::create(values.at(i), style.effectiveZoom()),
-                CSSPrimitiveValue::create(values.at(i + 1), style.effectiveZoom()));
-        }
+        for (unsigned i = 0; i < values.size(); i += 2)
+            polygonValue->appendPoint(CSSPrimitiveValue::create(values.at(i), style), CSSPrimitiveValue::create(values.at(i + 1), style));
+
         return polygonValue;
     }
     case BasicShape::BasicShapeInsetType: {
         const BasicShapeInset* inset = toBasicShapeInset(basicShape);
         CSSBasicShapeInsetValue* insetValue = CSSBasicShapeInsetValue::create();
 
-        insetValue->setTop(CSSPrimitiveValue::create(inset->top(), style.effectiveZoom()));
-        insetValue->setRight(CSSPrimitiveValue::create(inset->right(), style.effectiveZoom()));
-        insetValue->setBottom(CSSPrimitiveValue::create(inset->bottom(), style.effectiveZoom()));
-        insetValue->setLeft(CSSPrimitiveValue::create(inset->left(), style.effectiveZoom()));
+        insetValue->setTop(CSSPrimitiveValue::create(inset->top(), style));
+        insetValue->setRight(CSSPrimitiveValue::create(inset->right(), style));
+        insetValue->setBottom(CSSPrimitiveValue::create(inset->bottom(), style));
+        insetValue->setLeft(CSSPrimitiveValue::create(inset->left(), style));
 
-        insetValue->setTopLeftRadius(valueForLengthSize(inset->topLeftRadius(), style));
-        insetValue->setTopRightRadius(valueForLengthSize(inset->topRightRadius(), style));
-        insetValue->setBottomRightRadius(valueForLengthSize(inset->bottomRightRadius(), style));
-        insetValue->setBottomLeftRadius(valueForLengthSize(inset->bottomLeftRadius(), style));
+        insetValue->setTopLeftRadius(CSSValuePair::create(inset->topLeftRadius(), style));
+        insetValue->setTopRightRadius(CSSValuePair::create(inset->topRightRadius(), style));
+        insetValue->setBottomRightRadius(CSSValuePair::create(inset->bottomRightRadius(), style));
+        insetValue->setBottomLeftRadius(CSSValuePair::create(inset->bottomLeftRadius(), style));
 
         return insetValue;
     }
     default:
         return nullptr;
     }
 }
 
 static Length convertToLength(const StyleResolverState& state, const CSSPrimitiveValue* value)
 {
@@ skipping 125 matching lines @@
 }
 
 FloatPoint floatPointForCenterCoordinate(const BasicShapeCenterCoordinate& centerX, const BasicShapeCenterCoordinate& centerY, FloatSize boxSize)
 {
     float x = floatValueForLength(centerX.computedLength(), boxSize.width());
     float y = floatValueForLength(centerY.computedLength(), boxSize.height());
     return FloatPoint(x, y);
 }
 
 } // namespace blink