Backed out changeset 3ca9ebcd4233 (bug 1865637) for causing android mochitest failures in test_animations_effect_timing_duration.html

dom/animation/DocumentTimeline.cpp

@@ -47,11 +47,11 @@ DocumentTimeline::DocumentTimeline(Document* aDocument,
       mDocument(aDocument),
       mIsObservingRefreshDriver(false),
       mOriginTime(aOriginTime) {
+  if (mDocument) {
     mDocument->Timelines().insertBack(this);
-  // Ensure mLastRefreshDriverTime is valid.
-  if (nsDOMNavigationTiming* timing = mDocument->GetNavigationTiming()) {
-    mLastRefreshDriverTime = timing->GetNavigationStartTimeStamp();
   }
+  // Ensure mLastRefreshDriverTime is valid.
+  UpdateLastRefreshDriverTime();
 }
 
 DocumentTimeline::~DocumentTimeline() {
@@ -100,28 +100,41 @@ bool DocumentTimeline::TracksWallclockTime() const {
 }
 
 TimeStamp DocumentTimeline::GetCurrentTimeStamp() const {
-  if (nsRefreshDriver* refreshDriver = GetRefreshDriver()) {
+  nsRefreshDriver* refreshDriver = GetRefreshDriver();
-    auto ts = refreshDriver->MostRecentRefresh();
+  return refreshDriver ? refreshDriver->MostRecentRefresh()
-    if (ts > mLastRefreshDriverTime) {
+                       : mLastRefreshDriverTime;
-      return ts;
-    }
-  }
-  return mLastRefreshDriverTime;
 }
 
-bool DocumentTimeline::MaybeUpdateLastRefreshDriverTime(TimeStamp aTime) {
+void DocumentTimeline::UpdateLastRefreshDriverTime(TimeStamp aKnownTime) {
+  TimeStamp result = [&] {
+    if (!aKnownTime.IsNull()) {
+      return aKnownTime;
+    }
+    if (auto* rd = GetRefreshDriver()) {
+      return rd->MostRecentRefresh();
+    };
+    return mLastRefreshDriverTime;
+  }();
+
+  if (nsDOMNavigationTiming* timing = mDocument->GetNavigationTiming()) {
     // If we don't have a refresh driver and we've never had one use the
     // timeline's zero time.
-  // It's possible that our refresh driver's timestamp is behind from the
+    // In addition, it's possible that our refresh driver's timestamp is behind
-  // navigation start time because the refresh driver timestamp is sent
+    // from the navigation start time because the refresh driver timestamp is
-  // through an IPC call whereas the navigation time is set by calling
+    // sent through an IPC call whereas the navigation time is set by calling
-  // TimeStamp::Now() directly. Make sure we only advance.
+    // TimeStamp::Now() directly. In such cases we also use the timeline's zero
-  if (aTime < mLastRefreshDriverTime) {
+    // time.
-    return false;
+    // Also, let this time represent the current refresh time. This way we'll
+    // save it as the last refresh time and skip looking up navigation start
+    // time each time.
+    if (result.IsNull() || result < timing->GetNavigationStartTimeStamp()) {
+      result = timing->GetNavigationStartTimeStamp();
+    }
   }
 
-  mLastRefreshDriverTime = aTime;
+  if (!result.IsNull()) {
-  return true;
+    mLastRefreshDriverTime = result;
+  }
 }
 
 Nullable<TimeDuration> DocumentTimeline::ToTimelineTime(
@@ -156,26 +169,10 @@ void DocumentTimeline::NotifyAnimationUpdated(Animation& aAnimation) {
   }
 }
 
-void DocumentTimeline::TriggerAllPendingAnimationsNow() {
+void DocumentTimeline::MostRecentRefreshTimeUpdated() {
-  for (Animation* animation : mAnimationOrder) {
-    animation->TryTriggerNow();
-  }
-}
-
-void DocumentTimeline::WillRefresh(TimeStamp aTime) { MaybeTick(aTime); }
-
-void DocumentTimeline::NotifyTimerAdjusted(TimeStamp aTime) {
-  MaybeTick(aTime);
-}
-
-void DocumentTimeline::MaybeTick(TimeStamp aTime) {
-  if (!MaybeUpdateLastRefreshDriverTime(aTime)) {
-    return;
-  }
-
   MOZ_ASSERT(mIsObservingRefreshDriver);
   MOZ_ASSERT(GetRefreshDriver(),
-             "Should be able to reach refresh driver from within the tick");
+             "Should be able to reach refresh driver from within WillRefresh");
 
   nsAutoAnimationMutationBatch mb(mDocument);
 
@@ -203,6 +200,21 @@ void DocumentTimeline::MaybeTick(TimeStamp aTime) {
   }
 }
 
+void DocumentTimeline::TriggerAllPendingAnimationsNow() {
+  for (Animation* animation : mAnimationOrder) {
+    animation->TryTriggerNow();
+  }
+}
+
+void DocumentTimeline::WillRefresh(TimeStamp aTime) {
+  UpdateLastRefreshDriverTime();
+  MostRecentRefreshTimeUpdated();
+}
+
+void DocumentTimeline::NotifyTimerAdjusted(TimeStamp aTime) {
+  MostRecentRefreshTimeUpdated();
+}
+
 void DocumentTimeline::ObserveRefreshDriver(nsRefreshDriver* aDriver) {
   MOZ_ASSERT(!mIsObservingRefreshDriver);
   // Set the mIsObservingRefreshDriver flag before calling AddRefreshObserver
@@ -229,7 +241,7 @@ void DocumentTimeline::NotifyRefreshDriverCreated(nsRefreshDriver* aDriver) {
     // could perform a paint before the first refresh driver tick happens.  To
     // ensure we're in a consistent state in that case we run the first tick
     // manually.
-    MaybeTick(aDriver->MostRecentRefresh());
+    MostRecentRefreshTimeUpdated();
   }
 }
 

dom/animation/DocumentTimeline.h

@@ -71,8 +71,7 @@ class DocumentTimeline final : public AnimationTimeline,
 
   Document* GetDocument() const override { return mDocument; }
 
-  bool MaybeUpdateLastRefreshDriverTime(TimeStamp);
+  void UpdateLastRefreshDriverTime(TimeStamp aKnownTime = {});
-  void MaybeTick(TimeStamp);
 
   bool IsMonotonicallyIncreasing() const override { return true; }
 

dom/base/Document.cpp

@@ -13515,9 +13515,8 @@ void Document::SetNavigationTiming(nsDOMNavigationTiming* aTiming) {
   // If there's already the DocumentTimeline instance, tell it since the
   // DocumentTimeline is based on both the navigation start time stamp and the
   // refresh driver timestamp.
-  if (mDocumentTimeline && mTiming) {
+  if (mDocumentTimeline) {
-    mDocumentTimeline->MaybeUpdateLastRefreshDriverTime(
+    mDocumentTimeline->UpdateLastRefreshDriverTime();
-        mTiming->GetNavigationStartTimeStamp());
   }
 }