Merge mozilla-central to autoland

2017-01-12 10:39:04 +01:00
parent c49fdee3dd 11757a7943
commit c64603aa7e
410 changed files with 35928 additions and 1219 deletions
--- a/gfx/layers/composite/AsyncCompositionManager.cpp
+++ b/gfx/layers/composite/AsyncCompositionManager.cpp
@@ -613,12 +613,16 @@ SampleValue(float aPortion, const Animation& aAnimation,
    // below StyleAnimationValues.
    startValue =
      StyleAnimationValue::Accumulate(aAnimation.property(),
-                                      aLastValue,
+                                      aLastValue.IsNull()
+                                        ? aUnderlyingValue
+                                        : aLastValue,
                                      Move(startValue),
                                      aCurrentIteration);
    endValue =
      StyleAnimationValue::Accumulate(aAnimation.property(),
-                                      aLastValue,
+                                      aLastValue.IsNull()
+                                        ? aUnderlyingValue
+                                        : aLastValue,
                                      Move(endValue),
                                      aCurrentIteration);
  }