Diff
Modified: trunk/Source/WebCore/ChangeLog (193808 => 193809)
--- trunk/Source/WebCore/ChangeLog 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/ChangeLog 2015-12-09 05:48:43 UTC (rev 193809)
@@ -1,3 +1,67 @@
+2015-12-08 Simon Fraser <[email protected]>
+
+ Convert resetAnimValToBaseVal take a reference to a SVGAnimatedType
+ https://bugs.webkit.org/show_bug.cgi?id=152036
+
+ Reviewed by Zalan Bujtas.
+
+ Change resetAnimValToBaseVal() to take a reference at the last argument.
+
+ * svg/SVGAnimateElementBase.cpp:
+ (WebCore::SVGAnimateElementBase::resetAnimatedType):
+ * svg/SVGAnimatedAngle.cpp:
+ (WebCore::SVGAnimatedAngleAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedAngle.h:
+ * svg/SVGAnimatedBoolean.cpp:
+ (WebCore::SVGAnimatedBooleanAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedBoolean.h:
+ * svg/SVGAnimatedColor.h:
+ * svg/SVGAnimatedEnumeration.cpp:
+ (WebCore::SVGAnimatedEnumerationAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedEnumeration.h:
+ * svg/SVGAnimatedInteger.cpp:
+ (WebCore::SVGAnimatedIntegerAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedInteger.h:
+ * svg/SVGAnimatedIntegerOptionalInteger.cpp:
+ (WebCore::SVGAnimatedIntegerOptionalIntegerAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedIntegerOptionalInteger.h:
+ * svg/SVGAnimatedLength.cpp:
+ (WebCore::SVGAnimatedLengthAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedLength.h:
+ * svg/SVGAnimatedLengthList.cpp:
+ (WebCore::SVGAnimatedLengthListAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedLengthList.h:
+ * svg/SVGAnimatedNumber.cpp:
+ (WebCore::SVGAnimatedNumberAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedNumber.h:
+ * svg/SVGAnimatedNumberList.cpp:
+ (WebCore::SVGAnimatedNumberListAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedNumberList.h:
+ * svg/SVGAnimatedNumberOptionalNumber.cpp:
+ (WebCore::SVGAnimatedNumberOptionalNumberAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedNumberOptionalNumber.h:
+ * svg/SVGAnimatedPath.cpp:
+ (WebCore::SVGAnimatedPathAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedPath.h:
+ * svg/SVGAnimatedPointList.cpp:
+ (WebCore::SVGAnimatedPointListAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedPointList.h:
+ * svg/SVGAnimatedPreserveAspectRatio.cpp:
+ (WebCore::SVGAnimatedPreserveAspectRatioAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedPreserveAspectRatio.h:
+ * svg/SVGAnimatedRect.cpp:
+ (WebCore::SVGAnimatedRectAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedRect.h:
+ * svg/SVGAnimatedString.cpp:
+ (WebCore::SVGAnimatedStringAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedString.h:
+ * svg/SVGAnimatedTransformList.cpp:
+ (WebCore::SVGAnimatedTransformListAnimator::resetAnimValToBaseVal):
+ * svg/SVGAnimatedTransformList.h:
+ * svg/SVGAnimatedTypeAnimator.h:
+ (WebCore::SVGAnimatedTypeAnimator::resetFromBaseValue):
+ (WebCore::SVGAnimatedTypeAnimator::resetFromBaseValues):
+
2015-12-08 Myles C. Maxfield <[email protected]>
Remove Mavericks-specific code from FontCacheMac
Modified: trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimateElementBase.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -211,7 +211,7 @@
if (!m_animatedType)
m_animatedType = animator->startAnimValAnimation(m_animatedProperties);
else {
- animator->resetAnimValToBaseVal(m_animatedProperties, m_animatedType.get());
+ animator->resetAnimValToBaseVal(m_animatedProperties, *m_animatedType);
animator->animValDidChange(m_animatedProperties);
}
return;
Modified: trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedAngle.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -55,7 +55,7 @@
stopAnimValAnimationForTypes<SVGAnimatedAngle, SVGAnimatedEnumeration>(animatedTypes);
}
-void SVGAnimatedAngleAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedAngleAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValues<SVGAnimatedAngle, SVGAnimatedEnumeration>(animatedTypes, type, &SVGAnimatedType::angleAndEnumeration);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedAngle.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedAngle.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedAngle.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -45,7 +45,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedBoolean.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedBoolean.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedBoolean.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -46,7 +46,7 @@
stopAnimValAnimationForType<SVGAnimatedBoolean>(animatedTypes);
}
-void SVGAnimatedBooleanAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedBooleanAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedBoolean>(animatedTypes, type, &SVGAnimatedType::boolean);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedBoolean.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedBoolean.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedBoolean.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -46,7 +46,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedColor.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedColor.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedColor.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -32,7 +32,7 @@
std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override { return nullptr; }
void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override { }
- void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override { }
+ void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override { }
void animValWillChange(const SVGElementAnimatedPropertyList&) override { }
void animValDidChange(const SVGElementAnimatedPropertyList&) override { }
void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedEnumeration.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedEnumeration.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedEnumeration.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -124,7 +124,7 @@
stopAnimValAnimationForType<SVGAnimatedEnumeration>(animatedTypes);
}
-void SVGAnimatedEnumerationAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedEnumerationAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedEnumeration>(animatedTypes, type, &SVGAnimatedType::enumeration);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -42,7 +42,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedInteger.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedInteger.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedInteger.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -48,7 +48,7 @@
stopAnimValAnimationForType<SVGAnimatedInteger>(animatedTypes);
}
-void SVGAnimatedIntegerAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedIntegerAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedInteger>(animatedTypes, type, &SVGAnimatedType::integer);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedInteger.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedInteger.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedInteger.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -49,7 +49,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -57,7 +57,7 @@
stopAnimValAnimationForTypes<SVGAnimatedInteger, SVGAnimatedInteger>(animatedTypes);
}
-void SVGAnimatedIntegerOptionalIntegerAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedIntegerOptionalIntegerAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValues<SVGAnimatedInteger, SVGAnimatedInteger>(animatedTypes, type, &SVGAnimatedType::integerOptionalInteger);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedIntegerOptionalInteger.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -33,7 +33,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedLength.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedLength.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedLength.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -54,7 +54,7 @@
stopAnimValAnimationForType<SVGAnimatedLength>(animatedTypes);
}
-void SVGAnimatedLengthAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedLengthAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedLength>(animatedTypes, type, &SVGAnimatedType::length);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedLength.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedLength.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedLength.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -44,7 +44,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedLengthList.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedLengthList.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedLengthList.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -48,7 +48,7 @@
stopAnimValAnimationForType<SVGAnimatedLengthList>(animatedTypes);
}
-void SVGAnimatedLengthListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedLengthListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedLengthList>(animatedTypes, type, &SVGAnimatedType::lengthList);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedLengthList.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedLengthList.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedLengthList.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -44,7 +44,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumber.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumber.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumber.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -49,7 +49,7 @@
stopAnimValAnimationForType<SVGAnimatedNumber>(animatedTypes);
}
-void SVGAnimatedNumberAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedNumberAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedNumber>(animatedTypes, type, &SVGAnimatedType::number);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumber.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumber.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumber.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -47,7 +47,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumberList.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumberList.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumberList.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -47,7 +47,7 @@
stopAnimValAnimationForType<SVGAnimatedNumberList>(animatedTypes);
}
-void SVGAnimatedNumberListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedNumberListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedNumberList>(animatedTypes, type, &SVGAnimatedType::numberList);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumberList.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumberList.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumberList.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -44,7 +44,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -52,7 +52,7 @@
stopAnimValAnimationForTypes<SVGAnimatedNumber, SVGAnimatedNumber>(animatedTypes);
}
-void SVGAnimatedNumberOptionalNumberAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedNumberOptionalNumberAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValues<SVGAnimatedNumber, SVGAnimatedNumber>(animatedTypes, type, &SVGAnimatedType::numberOptionalNumber);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumberOptionalNumber.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -33,7 +33,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedPath.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPath.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPath.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -76,12 +76,11 @@
}
}
-void SVGAnimatedPathAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedPathAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
ASSERT(animatedTypes.size() >= 1);
- ASSERT(type);
- ASSERT(type->type() == m_type);
- resetAnimValToBaseVal(animatedTypes, type->path());
+ ASSERT(type.type() == m_type);
+ resetAnimValToBaseVal(animatedTypes, type.path());
}
void SVGAnimatedPathAnimator::animValWillChange(const SVGElementAnimatedPropertyList& animatedTypes)
Modified: trunk/Source/WebCore/svg/SVGAnimatedPath.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPath.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPath.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -33,7 +33,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedPointList.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPointList.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPointList.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -48,7 +48,7 @@
stopAnimValAnimationForType<SVGAnimatedPointList>(animatedTypes);
}
-void SVGAnimatedPointListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedPointListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedPointList>(animatedTypes, type, &SVGAnimatedType::pointList);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedPointList.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPointList.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPointList.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -37,7 +37,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -46,7 +46,7 @@
stopAnimValAnimationForType<SVGAnimatedPreserveAspectRatio>(animatedTypes);
}
-void SVGAnimatedPreserveAspectRatioAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedPreserveAspectRatioAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedPreserveAspectRatio>(animatedTypes, type, &SVGAnimatedType::preserveAspectRatio);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -44,7 +44,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedRect.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedRect.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedRect.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -47,7 +47,7 @@
stopAnimValAnimationForType<SVGAnimatedRect>(animatedTypes);
}
-void SVGAnimatedRectAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedRectAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedRect>(animatedTypes, type, &SVGAnimatedType::rect);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedRect.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedRect.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedRect.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -45,7 +45,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedString.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedString.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedString.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -46,7 +46,7 @@
stopAnimValAnimationForType<SVGAnimatedString>(animatedTypes);
}
-void SVGAnimatedStringAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedStringAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedString>(animatedTypes, type, &SVGAnimatedType::string);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedString.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedString.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedString.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -47,7 +47,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedTransformList.cpp (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedTransformList.cpp 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedTransformList.cpp 2015-12-09 05:48:43 UTC (rev 193809)
@@ -57,7 +57,7 @@
stopAnimValAnimationForType<SVGAnimatedTransformList>(animatedTypes);
}
-void SVGAnimatedTransformListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type)
+void SVGAnimatedTransformListAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type)
{
resetFromBaseValue<SVGAnimatedTransformList>(animatedTypes, type, &SVGAnimatedType::transformList);
}
Modified: trunk/Source/WebCore/svg/SVGAnimatedTransformList.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedTransformList.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedTransformList.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -43,7 +43,7 @@
virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override;
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override;
Modified: trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (193808 => 193809)
--- trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2015-12-09 04:15:09 UTC (rev 193808)
+++ trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2015-12-09 05:48:43 UTC (rev 193809)
@@ -43,7 +43,7 @@
virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) = 0;
virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) = 0;
- virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) = 0;
+ virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) = 0;
virtual void animValWillChange(const SVGElementAnimatedPropertyList&) = 0;
virtual void animValDidChange(const SVGElementAnimatedPropertyList&) = 0;
virtual void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*) = 0;
@@ -75,12 +75,11 @@
}
template<typename AnimValType>
- void resetFromBaseValue(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type, typename AnimValType::ContentType& (SVGAnimatedType::*getter)())
+ void resetFromBaseValue(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type, typename AnimValType::ContentType& (SVGAnimatedType::*getter)())
{
ASSERT(animatedTypes[0].properties.size() == 1);
- ASSERT(type);
- ASSERT(type->type() == m_type);
- typename AnimValType::ContentType& animatedTypeValue = (type->*getter)();
+ ASSERT(type.type() == m_type);
+ typename AnimValType::ContentType& animatedTypeValue = (type.*getter)();
animatedTypeValue = castAnimatedPropertyToActualType<AnimValType>(animatedTypes[0].properties[0].get())->currentBaseValue();
executeAction<AnimValType>(StartAnimationAction, animatedTypes, 0, &animatedTypeValue);
@@ -122,13 +121,12 @@
}
template<typename AnimValType1, typename AnimValType2>
- void resetFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type, std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& (SVGAnimatedType::*getter)())
+ void resetFromBaseValues(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type, std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& (SVGAnimatedType::*getter)())
{
ASSERT(animatedTypes[0].properties.size() == 2);
- ASSERT(type);
- ASSERT(type->type() == m_type);
+ ASSERT(type.type() == m_type);
- std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& animatedTypeValue = (type->*getter)();
+ std::pair<typename AnimValType1::ContentType, typename AnimValType2::ContentType>& animatedTypeValue = (type.*getter)();
animatedTypeValue.first = castAnimatedPropertyToActualType<AnimValType1>(animatedTypes[0].properties[0].get())->currentBaseValue();
animatedTypeValue.second = castAnimatedPropertyToActualType<AnimValType2>(animatedTypes[0].properties[1].get())->currentBaseValue();
