Revert of Evacuate ComputedStyle references from the CSS*Value hierarchy

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

Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
index fff867b6676fada17efd088b068c02f9517f1a14..ecbb928c555ecdb76cbd89b3e472ee2c5bd100c1 100644
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -87,7 +87,7 @@
 {
     if (length.isFixed())
         return zoomAdjustedPixelValue(length.value(), style);
-    return CSSPrimitiveValue::create(length, style.effectiveZoom());
+    return CSSPrimitiveValue::create(length, style);
 }
 
 static CSSPrimitiveValue* pixelValueForUnzoomedLength(const UnzoomedLength& unzoomedLength, const ComputedStyle& style)
@@ -95,7 +95,7 @@
     const Length& length = unzoomedLength.length();
     if (length.isFixed())
         return CSSPrimitiveValue::create(length.value(), CSSPrimitiveValue::UnitType::Pixels);
-    return CSSPrimitiveValue::create(length, style.effectiveZoom());
+    return CSSPrimitiveValue::create(length, style);
 }
 
 static CSSValueList* createPositionListForLayer(CSSPropertyID propertyID, const FillLayer& layer, const ComputedStyle& style)
@@ -313,13 +313,6 @@
     return CSSBorderImageSliceValue::create(CSSQuadValue::create(top, right, bottom, left, CSSQuadValue::SerializeAsQuad), image.fill());
 }
 
-static CSSPrimitiveValue* valueForBorderImageLength(const BorderImageLength& borderImageLength, const ComputedStyle& style)
-{
-    if (borderImageLength.isNumber())
-        return CSSPrimitiveValue::create(borderImageLength.number(), CSSPrimitiveValue::UnitType::Number);
-    return CSSPrimitiveValue::create(borderImageLength.length(), style.effectiveZoom());
-}
-
 static CSSQuadValue* valueForNinePieceImageQuad(const BorderImageLengthBox& box, const ComputedStyle& style)
 {
     // Create the slices.
@@ -328,27 +321,41 @@
     CSSPrimitiveValue* bottom = nullptr;
     CSSPrimitiveValue* left = nullptr;
 
-    top = valueForBorderImageLength(box.top(), style);
+    if (box.top().isNumber())
+        top = CSSPrimitiveValue::create(box.top().number(), CSSPrimitiveValue::UnitType::Number);
+    else
+        top = CSSPrimitiveValue::create(box.top().length(), style);
 
     if (box.right() == box.top() && box.bottom() == box.top() && box.left() == box.top()) {
         right = top;
         bottom = top;
         left = top;
     } else {
-        right = valueForBorderImageLength(box.right(), style);
+        if (box.right().isNumber())
+            right = CSSPrimitiveValue::create(box.right().number(), CSSPrimitiveValue::UnitType::Number);
+        else
+            right = CSSPrimitiveValue::create(box.right().length(), style);
 
         if (box.bottom() == box.top() && box.right() == box.left()) {
             bottom = top;
             left = right;
         } else {
-            bottom = valueForBorderImageLength(box.bottom(), style);
-
-            if (box.left() == box.right())
+            if (box.bottom().isNumber())
+                bottom = CSSPrimitiveValue::create(box.bottom().number(), CSSPrimitiveValue::UnitType::Number);
+            else
+                bottom = CSSPrimitiveValue::create(box.bottom().length(), style);
+
+            if (box.left() == box.right()) {
                 left = right;
-            else
-                left = valueForBorderImageLength(box.left(), style);
-        }
-    }
+            } else {
+                if (box.left().isNumber())
+                    left = CSSPrimitiveValue::create(box.left().number(), CSSPrimitiveValue::UnitType::Number);
+                else
+                    left = CSSPrimitiveValue::create(box.left().length(), style);
+            }
+        }
+    }
+
     return CSSQuadValue::create(top, right, bottom, left, CSSQuadValue::SerializeAsQuad);
 }
 
@@ -2652,7 +2659,7 @@
         }
         return CSSPrimitiveValue::createIdentifier(CSSValueNone);
     case CSSPropertyShapeMargin:
-        return CSSPrimitiveValue::create(style.shapeMargin(), style.effectiveZoom());
+        return CSSPrimitiveValue::create(style.shapeMargin(), style);
     case CSSPropertyShapeImageThreshold:
         return CSSPrimitiveValue::create(style.shapeImageThreshold(), CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyShapeOutside: