--- a/dom/smil/SMILAnimationFunction.h+++ b/dom/smil/SMILAnimationFunction.h@@ -3,25 +3,25 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef NS_SMILANIMATIONFUNCTION_H_ #define NS_SMILANIMATIONFUNCTION_H_ #include "mozilla/SMILTargetIdentifier.h"-#include "nsISMILAttr.h"+#include "nsAttrValue.h" #include "nsGkAtoms.h"-#include "nsString.h"+#include "nsISMILAttr.h"+#include "SMILKeySpline.h" #include "nsSMILTimeValue.h"-#include "nsSMILKeySpline.h"+#include "nsSMILTypes.h" #include "nsSMILValue.h"+#include "nsString.h" #include "nsTArray.h"-#include "nsAttrValue.h"-#include "nsSMILTypes.h" namespace mozilla { namespace dom { class SVGAnimationElement; } // namespace dom //---------------------------------------------------------------------- // SMILAnimationFunction@@ -396,17 +396,17 @@ class SMILAnimationFunction { // Members // ------- static nsAttrValue::EnumTable sAdditiveTable[]; static nsAttrValue::EnumTable sCalcModeTable[]; static nsAttrValue::EnumTable sAccumulateTable[]; FallibleTArray<double> mKeyTimes;- FallibleTArray<nsSMILKeySpline> mKeySplines;+ FallibleTArray<SMILKeySpline> mKeySplines; // These are the parameters provided by the previous sample. Currently we // perform lazy calculation. That is, we only calculate the result if and when // instructed by the compositor. This allows us to apply the result directly // to the animation value and allows the compositor to filter out functions // that it determines will not contribute to the final result. nsSMILTime mSampleTime; // sample time within simple dur nsSMILTimeValue mSimpleDuration;