| Index: Source/core/svg/SVGLength.h
|
| diff --git a/Source/core/svg/SVGLength.h b/Source/core/svg/SVGLength.h
|
| index b43f59c8c9f254d0296cb2867c5ea35f64a05abc..31310509b1b7d1b78ab262019e68ea658975d677 100644
|
| --- a/Source/core/svg/SVGLength.h
|
| +++ b/Source/core/svg/SVGLength.h
|
| @@ -114,13 +114,13 @@ public:
|
| return *this;
|
|
|
| SVGLength length;
|
| - TrackExceptionState es;
|
| + TrackExceptionState exceptionState;
|
|
|
| if (fromType == LengthTypePercentage || toType == LengthTypePercentage) {
|
| float fromPercent = from.valueAsPercentage() * 100;
|
| float toPercent = valueAsPercentage() * 100;
|
| - length.newValueSpecifiedUnits(LengthTypePercentage, WebCore::blend(fromPercent, toPercent, progress), es);
|
| - if (es.hadException())
|
| + length.newValueSpecifiedUnits(LengthTypePercentage, WebCore::blend(fromPercent, toPercent, progress), exceptionState);
|
| + if (exceptionState.hadException())
|
| return SVGLength();
|
| return length;
|
| }
|
| @@ -129,10 +129,10 @@ public:
|
| float fromValue = from.valueInSpecifiedUnits();
|
| float toValue = valueInSpecifiedUnits();
|
| if (isZero())
|
| - length.newValueSpecifiedUnits(fromType, WebCore::blend(fromValue, toValue, progress), es);
|
| + length.newValueSpecifiedUnits(fromType, WebCore::blend(fromValue, toValue, progress), exceptionState);
|
| else
|
| - length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), es);
|
| - if (es.hadException())
|
| + length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), exceptionState);
|
| + if (exceptionState.hadException())
|
| return SVGLength();
|
| return length;
|
| }
|
| @@ -141,18 +141,18 @@ public:
|
| ASSERT(!from.isRelative());
|
|
|
| SVGLengthContext nonRelativeLengthContext(0);
|
| - float fromValueInUserUnits = nonRelativeLengthContext.convertValueToUserUnits(from.valueInSpecifiedUnits(), from.unitMode(), fromType, es);
|
| - if (es.hadException())
|
| + float fromValueInUserUnits = nonRelativeLengthContext.convertValueToUserUnits(from.valueInSpecifiedUnits(), from.unitMode(), fromType, exceptionState);
|
| + if (exceptionState.hadException())
|
| return SVGLength();
|
|
|
| - float fromValue = nonRelativeLengthContext.convertValueFromUserUnits(fromValueInUserUnits, unitMode(), toType, es);
|
| - if (es.hadException())
|
| + float fromValue = nonRelativeLengthContext.convertValueFromUserUnits(fromValueInUserUnits, unitMode(), toType, exceptionState);
|
| + if (exceptionState.hadException())
|
| return SVGLength();
|
|
|
| float toValue = valueInSpecifiedUnits();
|
| - length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), es);
|
| + length.newValueSpecifiedUnits(toType, WebCore::blend(fromValue, toValue, progress), exceptionState);
|
|
|
| - if (es.hadException())
|
| + if (exceptionState.hadException())
|
| return SVGLength();
|
| return length;
|
| }
|
|
|