Use Length for the stroke-width property in SVGLayoutStyle

Source/core/css/resolver/AnimatedStyleBuilder.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "core/animation/animatable/AnimatableDoubleAndBool.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableImage.h"
 #include "core/animation/animatable/AnimatableLength.h"
 #include "core/animation/animatable/AnimatableLengthBox.h"
 #include "core/animation/animatable/AnimatableLengthBoxAndBool.h"
 #include "core/animation/animatable/AnimatableLengthPoint.h"
 #include "core/animation/animatable/AnimatableLengthPoint3D.h"
 #include "core/animation/animatable/AnimatableLengthSize.h"
 #include "core/animation/animatable/AnimatableRepeatable.h"
-#include "core/animation/animatable/AnimatableSVGLength.h"
 #include "core/animation/animatable/AnimatableSVGPaint.h"
 #include "core/animation/animatable/AnimatableShadow.h"
 #include "core/animation/animatable/AnimatableShapeValue.h"
 #include "core/animation/animatable/AnimatableStrokeDasharrayList.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableUnknown.h"
 #include "core/animation/animatable/AnimatableValue.h"
 #include "core/animation/animatable/AnimatableVisibility.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/layout/style/LayoutStyle.h"
 #include "wtf/MathExtras.h"
 #include "wtf/TypeTraits.h"
 
 namespace blink {
 
 namespace {
 
+Length animatableValueToLengthWithZoom(const AnimatableValue* value, float zoom, ValueRange range = ValueRangeAll)
+{
+    if (value->isLength())
+        return toAnimatableLength(value)->length(zoom, range);
+    ASSERT(toAnimatableUnknown(value)->toCSSValueID() == CSSValueAuto);
+    return Length(Auto);
+}
+
 Length animatableValueToLength(const AnimatableValue* value, const StyleResolverState& state, ValueRange range = ValueRangeAll)
 {
-    if (value->isLength())
-        return toAnimatableLength(value)->length(state.style()->effectiveZoom(), range);
-    ASSERT(toAnimatableUnknown(value)->toCSSValueID() == CSSValueAuto);
-    return Length(Auto);
+    return animatableValueToLengthWithZoom(value, state.style()->effectiveZoom(), range);
+}
+
+UnzoomedLength animatableValueToUnzoomedLength(const AnimatableValue* value, const StyleResolverState&, ValueRange range = ValueRangeAll)
+{
+    return UnzoomedLength(animatableValueToLengthWithZoom(value, 1, range));
 }
 
 BorderImageLength animatableValueToBorderImageLength(const AnimatableValue* value, const StyleResolverState& state)
 {
     if (value->isLength())
         return BorderImageLength(toAnimatableLength(value)->length(state.style()->effectiveZoom(), ValueRangeNonNegative));
     if (value->isDouble())
         return BorderImageLength(clampTo<double>(toAnimatableDouble(value)->toDouble(), 0));
     ASSERT(toAnimatableUnknown(value)->toCSSValueID() == CSSValueAuto);
     return Length(Auto);
@@ skipping 52 matching lines @@
 }
 
 void setFillSize(FillLayer* fillLayer, const AnimatableValue* value, StyleResolverState& state)
 {
     if (value->isLengthSize())
         fillLayer->setSize(FillSize(SizeLength, animatableValueToLengthSize(value, state, ValueRangeNonNegative)));
     else
         CSSToStyleMap::mapFillSize(state, fillLayer, toAnimatableUnknown(value)->toCSSValue().get());
 }
 
-PassRefPtrWillBeRawPtr<SVGLength> animatableValueToNonNegativeSVGLength(const AnimatableValue* value)
-{
-    RefPtrWillBeRawPtr<SVGLength> length = toAnimatableSVGLength(value)->toSVGLength();
-    if (length->valueInSpecifiedUnits() < 0)
-        length->setValueInSpecifiedUnits(0);
-    return length.release();
-}
-
 template <CSSPropertyID property>
 void setOnFillLayers(FillLayer& fillLayers, const AnimatableValue* value, StyleResolverState& state)
 {
     const WillBeHeapVector<RefPtrWillBeMember<AnimatableValue> >& values = toAnimatableRepeatable(value)->values();
     ASSERT(!values.isEmpty());
     FillLayer* fillLayer = &fillLayers;
     FillLayer* prev = 0;
     for (size_t i = 0; i < values.size(); ++i) {
         if (!fillLayer)
             fillLayer = prev->ensureNext();
@@ skipping 306 matching lines @@
     case CSSPropertyPaddingRight:
         style->setPaddingRight(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyPaddingTop:
         style->setPaddingTop(animatableValueToLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyRight:
         style->setRight(animatableValueToLength(value, state));
         return;
     case CSSPropertyStrokeWidth:
-        style->setStrokeWidth(animatableValueToNonNegativeSVGLength(value));
+        style->setStrokeWidth(animatableValueToUnzoomedLength(value, state, ValueRangeNonNegative));
         return;
     case CSSPropertyStopColor:
         style->setStopColor(toAnimatableColor(value)->color());
         return;
     case CSSPropertyStopOpacity:
         style->setStopOpacity(clampTo<float>(toAnimatableDouble(value)->toDouble(), 0, 1));
         return;
     case CSSPropertyStrokeDasharray:
         style->setStrokeDashArray(toAnimatableStrokeDasharrayList(value)->toSVGDashArray(style->effectiveZoom()));
         return;
@@ skipping 147 matching lines @@
     case CSSPropertyRy:
         style->setRy(animatableValueToLength(value, state));
         return;
 
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink