Allow number-percentage calc() in border-image-slice

third_party/WebKit/Source/core/css/resolver/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 465 matching lines @@
             state.style()->setBorderTopWidth(image.borderSlices().top().length().value());
         if (image.borderSlices().right().isLength() && image.borderSlices().right().length().isFixed())
             state.style()->setBorderRightWidth(image.borderSlices().right().length().value());
         if (image.borderSlices().bottom().isLength() && image.borderSlices().bottom().length().isFixed())
             state.style()->setBorderBottomWidth(image.borderSlices().bottom().length().value());
         if (image.borderSlices().left().isLength() && image.borderSlices().left().length().isFixed())
             state.style()->setBorderLeftWidth(image.borderSlices().left().length().value());
     }
 }
 
-static Length convertBorderImageSliceSide(const CSSPrimitiveValue& value)
+static Length convertBorderImageSliceSide(const CSSPrimitiveValue& value, const CSSToLengthConversionData& conversionData)
 {
-    if (value.isPercentage())
-        return Length(value.getDoubleValue(), Percent);
+    if (value.isPercentage() || value.isCalculated())
+        return value.convertToLength(conversionData);
     return Length(round(value.getDoubleValue()), Fixed);
 }
 
-void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState&, const CSSValue& value, NinePieceImage& image)
+void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState& state, const CSSValue& value, NinePieceImage& image)
 {
     if (!value.isBorderImageSliceValue())
         return;
 
     // Retrieve the border image value.
     const CSSBorderImageSliceValue& borderImageSlice = toCSSBorderImageSliceValue(value);
 
     // Set up a length box to represent our image slices.
     LengthBox box;
     const CSSQuadValue& slices = borderImageSlice.slices();
-    box.m_top = convertBorderImageSliceSide(*slices.top());
-    box.m_bottom = convertBorderImageSliceSide(*slices.bottom());
-    box.m_left = convertBorderImageSliceSide(*slices.left());
-    box.m_right = convertBorderImageSliceSide(*slices.right());
+    box.m_top = convertBorderImageSliceSide(*slices.top(), state.cssToLengthConversionData());
+    box.m_bottom = convertBorderImageSliceSide(*slices.bottom(), state.cssToLengthConversionData());
+    box.m_left = convertBorderImageSliceSide(*slices.left(), state.cssToLengthConversionData());
+    box.m_right = convertBorderImageSliceSide(*slices.right(), state.cssToLengthConversionData());
     image.setImageSlices(box);
 
     // Set our fill mode.
     image.setFill(borderImageSlice.fill());
 }
 
 static BorderImageLength toBorderImageLength(CSSPrimitiveValue& value, const CSSToLengthConversionData& conversionData)
 {
     if (value.isNumber())
         return value.getDoubleValue();
@@ skipping 57 matching lines @@
         verticalRule = SpaceImageRule;
         break;
     default: // CSSValueRepeat
         verticalRule = RepeatImageRule;
         break;
     }
     image.setVerticalRule(verticalRule);
 }
 
 } // namespace blink