Factor out common BorderImageLength code in CSSToStyleMap

Source/core/css/CSSToStyleMap.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 592 matching lines @@
     if (slices->right()->isPercentage())
         box.m_right = Length(slices->right()->getDoubleValue(), Percent);
     else
         box.m_right = Length(slices->right()->getIntValue(CSSPrimitiveValue::CSS_NUMBER), Fixed);
     image.setImageSlices(box);
 
     // Set our fill mode.
     image.setFill(borderImageSlice->m_fill);
 }
 
+static BorderImageLength toBorderImageLength(CSSPrimitiveValue& value, const RenderStyle* currStyle, const RenderStyle* rootStyle, float multiplier)

[Julien - ping for review, 2013/11/24 22:53:01]

s/currStyle/currentStyle/ (3 characters isn't much of a saving IMO) 

[davve, 2013/11/25 22:15:16]

Done.

+{
+    if (value.isNumber())
+        return value.getDoubleValue();
+    if (value.isPercentage())
+        return Length(value.getDoubleValue(CSSPrimitiveValue::CSS_PERCENTAGE), Percent);
+    if (value.getValueID() != CSSValueAuto)
+        return value.computeLength<Length>(currStyle, rootStyle, multiplier);
+    return Length(Auto);
+}
+
 BorderImageLengthBox CSSToStyleMap::mapNinePieceImageQuad(CSSValue* value) const
 {
     if (!value || !value->isPrimitiveValue())
-        return BorderImageLengthBox();
+        return BorderImageLengthBox(Length(Auto));
 
-    // Get our zoom value.
     float zoom = useSVGZoomRules() ? 1.0f : style()->effectiveZoom();
+    Quad* slices = toCSSPrimitiveValue(value)->getQuadValue();
 
-    // Retrieve the primitive value.
-    CSSPrimitiveValue* borderWidths = toCSSPrimitiveValue(value);
-
-    // Set up a length box to represent our image slices.
-    BorderImageLengthBox box; // Defaults to 'auto' so we don't have to handle that explicitly below.
-    Quad* slices = borderWidths->getQuadValue();
-    if (slices->top()->isNumber())
-        box.setTop(slices->top()->getDoubleValue());
-    else if (slices->top()->isPercentage())
-        box.setTop(Length(slices->top()->getDoubleValue(CSSPrimitiveValue::CSS_PERCENTAGE), Percent));
-    else if (slices->top()->getValueID() != CSSValueAuto)
-        box.setTop(slices->top()->computeLength<Length>(style(), rootElementStyle(), zoom));
-
-    if (slices->right()->isNumber())
-        box.setRight(slices->right()->getDoubleValue());
-    else if (slices->right()->isPercentage())
-        box.setRight(Length(slices->right()->getDoubleValue(CSSPrimitiveValue::CSS_PERCENTAGE), Percent));
-    else if (slices->right()->getValueID() != CSSValueAuto)
-        box.setRight(slices->right()->computeLength<Length>(style(), rootElementStyle(), zoom));
-
-    if (slices->bottom()->isNumber())
-        box.setBottom(slices->bottom()->getDoubleValue());
-    else if (slices->bottom()->isPercentage())
-        box.setBottom(Length(slices->bottom()->getDoubleValue(CSSPrimitiveValue::CSS_PERCENTAGE), Percent));
-    else if (slices->bottom()->getValueID() != CSSValueAuto)
-        box.setBottom(slices->bottom()->computeLength<Length>(style(), rootElementStyle(), zoom));
-
-    if (slices->left()->isNumber())
-        box.setLeft(slices->left()->getDoubleValue());
-    else if (slices->left()->isPercentage())
-        box.setLeft(Length(slices->left()->getDoubleValue(CSSPrimitiveValue::CSS_PERCENTAGE), Percent));
-    else if (slices->left()->getValueID() != CSSValueAuto)
-        box.setLeft(slices->left()->computeLength<Length>(style(), rootElementStyle(), zoom));
-
-    return box;
+    // Set up a border image length box to represent our image slices.
+    return BorderImageLengthBox(
+        toBorderImageLength(*slices->top(), style(), rootElementStyle(), zoom),
+        toBorderImageLength(*slices->right(), style(), rootElementStyle(), zoom),
+        toBorderImageLength(*slices->bottom(), style(), rootElementStyle(), zoom),
+        toBorderImageLength(*slices->left(), style(), rootElementStyle(), zoom));
 }
 
 void CSSToStyleMap::mapNinePieceImageRepeat(CSSValue* value, NinePieceImage& image) const
 {
     if (!value || !value->isPrimitiveValue())
         return;
 
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     Pair* pair = primitiveValue->getPairValue();
     if (!pair || !pair->first() || !pair->second())
@@ skipping 31 matching lines @@
         verticalRule = SpaceImageRule;
         break;
     default: // CSSValueRepeat
         verticalRule = RepeatImageRule;
         break;
     }
     image.setVerticalRule(verticalRule);
 }
 
 };