Merge 'end' instance time lookup into ResolveActiveEnd

The two callsites that call ResolveActiveEnd() also perform an 'end'
instance time lookup and handle an 'unresolved' value, so merge these
two bits into ResolveActiveEnd().

Bug: 998526
Change-Id: I0e1dff5a465c47e16e23b74b42bcec68ba83b7f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855987
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705401}

third_party/blink/renderer/core/svg/animation/svg_smil_element.cc

@@ -759,8 +759,13 @@ SMILTime SVGSMILElement::RepeatingDuration() const {
   return repeat_dur;
 }
 
-SMILTime SVGSMILElement::ResolveActiveEnd(SMILTime resolved_begin,
-                                          SMILTime resolved_end) const {
+SMILTime SVGSMILElement::ResolveActiveEnd(SMILTime resolved_begin) const {
+  SMILTime resolved_end = FindInstanceTime(kEnd, resolved_begin, false);
+  if (resolved_end.IsUnresolved()) {
+    // If we have no pending end conditions, don't generate a new interval.
+    if (!end_times_.IsEmpty() && !has_end_event_conditions_)
+      return SMILTime::Unresolved();
+  }
   // Computing the active duration
   // http://www.w3.org/TR/SMIL2/smil-timing.html#Timing-ComputingActiveDur
   SMILTime preliminary_active_duration;
@@ -793,15 +798,10 @@ SMILInterval SVGSMILElement::ResolveInterval(SMILTime begin_after,
     SMILTime temp_begin = FindInstanceTime(kBegin, begin_after, true);
     if (temp_begin.IsUnresolved())
       break;
-    SMILTime temp_end = FindInstanceTime(kEnd, temp_begin, false);
-    if (temp_end.IsUnresolved()) {
-      // If we have no pending end conditions, don't generate a new interval.
-      if (!end_times_.IsEmpty() && !has_end_event_conditions_)
-        break;
-    }
-    temp_end = ResolveActiveEnd(temp_begin, temp_end);
-    // If this is the first interval being resolved, don't allow it to end
-    // before the origin of the timeline.
+    SMILTime temp_end = ResolveActiveEnd(temp_begin);
+    if (temp_end.IsUnresolved())
+      break;
+    // Don't allow the interval to end in the past.
     if (temp_end > end_after) {
       DCHECK(!temp_begin.IsIndefinite());
       return SMILInterval(temp_begin, temp_end);
@@ -882,15 +882,12 @@ void SVGSMILElement::DiscardOrRevalidateCurrentInterval(
   // If we have a current interval but it has not yet ended, re-resolve the
   // end time.
   if (interval_.EndsAfter(presentation_time)) {
-    SMILTime new_end = FindInstanceTime(kEnd, interval_.begin, false);
+    SMILTime new_end = ResolveActiveEnd(interval_.begin);
     if (new_end.IsUnresolved()) {
-      // If we have no pending end conditions, discard the current interval.
-      if (!end_times_.IsEmpty() && !has_end_event_conditions_) {
-        interval_ = SMILInterval::Unresolved();
-        return;
-      }
+      // No active duration, discard the current interval.
+      interval_ = SMILInterval::Unresolved();
+      return;
     }
-    new_end = ResolveActiveEnd(interval_.begin, new_end);
     if (new_end != interval_.end)
       SetNewIntervalEnd(new_end, presentation_time);
   }

third_party/blink/renderer/core/svg/animation/svg_smil_element.h

@@ -165,13 +165,11 @@ class CORE_EXPORT SVGSMILElement : public SVGElement, public SVGTests {
   SMILTime BeginTimeForPrioritization(SMILTime presentation_time) const;
 
   SMILInterval ResolveInterval(SMILTime begin_after, SMILTime end_after) const;
-  bool ResolveFirstInterval(SMILTime presentation_time);
   // Check if the current interval is still current, and apply restart
   // semantics. Returns true if a new interval should be resolved.
   bool HandleIntervalRestart(SMILTime presentation_time);
   void DiscardOrRevalidateCurrentInterval(SMILTime presentation_time);
-  SMILTime ResolveActiveEnd(SMILTime resolved_begin,
-                            SMILTime resolved_end) const;
+  SMILTime ResolveActiveEnd(SMILTime resolved_begin) const;
   SMILTime RepeatingDuration() const;
   const SMILInterval& GetActiveInterval(SMILTime elapsed) const;
   void SetNewInterval(const SMILInterval&, SMILTime presentation_time);