mozilla-central: changeset 256750:f8b8e1084b4080b39a8278112aa4519cd0db0eba

author	Brian Birtles <birtles@gmail.com>
	Fri, 07 Aug 2015 12:29:36 +0900
changeset 256750	f8b8e1084b4080b39a8278112aa4519cd0db0eba
parent 256749	bcf2c0c393cf0642f7a100c3e4e7d6b0b6b748f5
child 256751	c9b2670f5c1a1fed0cef6b7fa2b98b1f3fa789be
push id	29187
push user	cbook@mozilla.com
push date	Fri, 07 Aug 2015 11:13:32 +0000
treeherder	mozilla-central@3e51753a099f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dbaron
bugs	1181392
milestone	42.0a1
first release with	nightly linux32 943b79d9c65f / 42.0a1 / 20150808030207 / files nightly linux64 943b79d9c65f / 42.0a1 / 20150808030207 / files nightly mac 943b79d9c65f / 42.0a1 / 20150808030207 / files nightly win32 943b79d9c65f / 42.0a1 / 20150808030207 / files nightly win64 943b79d9c65f / 42.0a1 / 20150808030207 / files
last release without	nightly linux32 2fad09a0540d / 42.0a1 / 20150806103222 / files nightly linux64 2fad09a0540d / 42.0a1 / 20150806103224 / files nightly mac 2fad09a0540d / 42.0a1 / 20150806103222 / files nightly win32 2fad09a0540d / 42.0a1 / 20150806103223 / files nightly win64 2fad09a0540d / 42.0a1 / 20150806103224 / files

Bug 1181392 part 4 - Remove use of IsFinishedTransition from nsLayoutUtils; r=dbaron GetMinAndMaxScaleForAnimationProperty in nsLayoutUtils uses IsFinishedTransition to ignore finished transitions since they should not have any effect on current or future scale values. We can generalize this, however, and say we are only interested in animations that are *either*: a) running or scheduled to run in the future, i.e. "current", OR b) applying a value, including a finished animation with a forwards fill, i.e. "in effect" Elsewhere, animations that fulfil *either* of this conditions are referred to as "relevant animations" so we can simply test for relevance in this function.

layout/base/nsLayoutUtils.cpp

file | annotate | diff | comparison | revisions

--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -459,17 +459,17 @@ GetSuitableScale(float aMaxScale, float 
 static void
 GetMinAndMaxScaleForAnimationProperty(const nsIFrame* aFrame,
                                       AnimationCollection* aAnimations,
                                       gfxSize& aMaxScale,
                                       gfxSize& aMinScale)
 {
   for (size_t animIdx = aAnimations->mAnimations.Length(); animIdx-- != 0; ) {
     dom::Animation* anim = aAnimations->mAnimations[animIdx];
-    if (!anim->GetEffect() || anim->GetEffect()->IsFinishedTransition()) {
+    if (!anim->IsRelevant()) {
       continue;
     }
     dom::KeyframeEffectReadOnly* effect = anim->GetEffect();
     for (size_t propIdx = effect->Properties().Length(); propIdx-- != 0; ) {
       AnimationProperty& prop = effect->Properties()[propIdx];
       if (prop.mProperty == eCSSProperty_transform) {
         for (uint32_t segIdx = prop.mSegments.Length(); segIdx-- != 0; ) {
           AnimationPropertySegment& segment = prop.mSegments[segIdx];