From 75ca3d0b5dadbbdde37c8976df8f34f564189873 Mon Sep 17 00:00:00 2001 From: Brian Birtles Date: Fri, 27 Jun 2014 08:57:11 +0900 Subject: [PATCH] Bug 1010067 part 3 - Rename nsAnimation to mozilla::StyleAnimation; r=dbaron --- layout/style/nsAnimationManager.cpp | 4 ++-- layout/style/nsAnimationManager.h | 3 ++- layout/style/nsComputedDOMStyle.cpp | 14 +++++++------- layout/style/nsRuleNode.cpp | 2 +- layout/style/nsStyleStruct.cpp | 4 ++-- layout/style/nsStyleStruct.h | 12 ++++++++---- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index 5aa8fad53b4..bd0927976a9 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -387,7 +387,7 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext, TimeStamp now = mPresContext->RefreshDriver()->MostRecentRefresh(); for (uint32_t animIdx = 0, animEnd = disp->mAnimationNameCount; animIdx != animEnd; ++animIdx) { - const nsAnimation& src = disp->mAnimations[animIdx]; + const StyleAnimation& src = disp->mAnimations[animIdx]; nsRefPtr dest = *aAnimations.AppendElement(new ElementAnimation()); @@ -565,7 +565,7 @@ bool nsAnimationManager::BuildSegment(InfallibleTArray& aSegments, nsCSSProperty aProperty, - const nsAnimation& aAnimation, + const StyleAnimation& aAnimation, float aFromKey, nsStyleContext* aFromContext, mozilla::css::Declaration* aFromDeclaration, float aToKey, nsStyleContext* aToContext) diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h index 8253f83d377..c056e508b14 100644 --- a/layout/style/nsAnimationManager.h +++ b/layout/style/nsAnimationManager.h @@ -153,7 +153,8 @@ private: mozilla::ElementAnimationPtrArray& aAnimations); bool BuildSegment(InfallibleTArray& aSegments, - nsCSSProperty aProperty, const nsAnimation& aAnimation, + nsCSSProperty aProperty, + const mozilla::StyleAnimation& aAnimation, float aFromKey, nsStyleContext* aFromContext, mozilla::css::Declaration* aFromDeclaration, float aToKey, nsStyleContext* aToContext); diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 2bf4eb832dd..f52003c781d 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -5314,7 +5314,7 @@ nsComputedDOMStyle::DoGetAnimationName() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* property = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(property); @@ -5342,7 +5342,7 @@ nsComputedDOMStyle::DoGetAnimationDelay() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* delay = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(delay); delay->SetTime((float)animation->GetDelay() / (float)PR_MSEC_PER_SEC); @@ -5362,7 +5362,7 @@ nsComputedDOMStyle::DoGetAnimationDuration() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* duration = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(duration); @@ -5401,7 +5401,7 @@ nsComputedDOMStyle::DoGetAnimationDirection() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* direction = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(direction); direction->SetIdent( @@ -5423,7 +5423,7 @@ nsComputedDOMStyle::DoGetAnimationFillMode() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* fillMode = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(fillMode); fillMode->SetIdent( @@ -5445,7 +5445,7 @@ nsComputedDOMStyle::DoGetAnimationIterationCount() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* iterationCount = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(iterationCount); @@ -5479,7 +5479,7 @@ nsComputedDOMStyle::DoGetAnimationPlayState() "first item must be explicit"); uint32_t i = 0; do { - const nsAnimation *animation = &display->mAnimations[i]; + const StyleAnimation *animation = &display->mAnimations[i]; nsROCSSPrimitiveValue* playState = new nsROCSSPrimitiveValue; valueList->AppendCSSValue(playState); playState->SetIdent( diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index 9102ea5b5bf..29a2a1c9b93 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -4981,7 +4981,7 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct, // Fill in the animations we just allocated with the appropriate values. for (uint32_t i = 0; i < numAnimations; ++i) { - nsAnimation *animation = &display->mAnimations[i]; + StyleAnimation *animation = &display->mAnimations[i]; if (i >= animDelay.num) { animation->SetDelay(display->mAnimations[i % animDelay.num].GetDelay()); diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 8e953e90f4b..94d81fa8ca2 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -2341,7 +2341,7 @@ void nsTransition::SetUnknownProperty(const nsAString& aUnknownProperty) mUnknownProperty = do_GetAtom(aUnknownProperty); } -nsAnimation::nsAnimation(const nsAnimation& aCopy) +mozilla::StyleAnimation::StyleAnimation(const mozilla::StyleAnimation& aCopy) : mTimingFunction(aCopy.mTimingFunction) , mDuration(aCopy.mDuration) , mDelay(aCopy.mDelay) @@ -2354,7 +2354,7 @@ nsAnimation::nsAnimation(const nsAnimation& aCopy) } void -nsAnimation::SetInitialValues() +mozilla::StyleAnimation::SetInitialValues() { mTimingFunction = nsTimingFunction(NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE); mDuration = 0.0; diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 25df813e3d5..de3b027c057 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -1850,9 +1850,11 @@ private: // eCSSProperty_UNKNOWN }; -struct nsAnimation { - nsAnimation() { /* leaves uninitialized; see also SetInitialValues */ } - explicit nsAnimation(const nsAnimation& aCopy); +namespace mozilla { + +struct StyleAnimation { + StyleAnimation() { /* leaves uninitialized; see also SetInitialValues */ } + explicit StyleAnimation(const StyleAnimation& aCopy); void SetInitialValues(); @@ -1891,6 +1893,8 @@ private: float mIterationCount; // mozilla::PositiveInfinity() means infinite }; +} // namespace mozilla + struct nsStyleDisplay { nsStyleDisplay(); nsStyleDisplay(const nsStyleDisplay& aOther); @@ -1976,7 +1980,7 @@ struct nsStyleDisplay { mTransitionDelayCount, mTransitionPropertyCount; - nsAutoTArray mAnimations; // [reset] + nsAutoTArray mAnimations; // [reset] // The number of elements in mAnimations that are not from repeating // a list due to another property being longer. uint32_t mAnimationTimingFunctionCount,