Convert SVGSMILElement::resolveInterval to return an SMILInterval

Source/core/svg/animation/SVGSMILElement.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 877 matching lines @@
     SMILTime maxValue = this->maxValue();
     if (minValue > maxValue) {
         // Ignore both.
         // http://www.w3.org/TR/2001/REC-smil-animation-20010904/#MinMax
         minValue = 0;
         maxValue = SMILTime::indefinite();
     }
     return resolvedBegin + min(maxValue, max(minValue, preliminaryActiveDuration));
 }
 
-void SVGSMILElement::resolveInterval(bool first, SMILTime& beginResult, SMILTime& endResult) const
+SMILInterval SVGSMILElement::resolveInterval(ResolveInterval resolveIntervalType) const
 {
+    bool first = resolveIntervalType == FirstInterval;
     // See the pseudocode in http://www.w3.org/TR/SMIL3/smil-timing.html#q90.
     SMILTime beginAfter = first ? -numeric_limits<double>::infinity() : m_interval.end;
     SMILTime lastIntervalTempEnd = numeric_limits<double>::infinity();
     while (true) {
         bool equalsMinimumOK = !first || m_interval.end > m_interval.begin;
         SMILTime tempBegin = findInstanceTime(Begin, beginAfter, equalsMinimumOK);
         if (tempBegin.isUnresolved())
             break;
         SMILTime tempEnd;
         if (m_endTimes.isEmpty())
             tempEnd = resolveActiveEnd(tempBegin, SMILTime::indefinite());
         else {
             tempEnd = findInstanceTime(End, tempBegin, true);
             if ((first && tempBegin == tempEnd && tempEnd == lastIntervalTempEnd) || (!first && tempEnd == m_interval.end))
                 tempEnd = findInstanceTime(End, tempBegin, false);
             if (tempEnd.isUnresolved()) {
                 if (!m_endTimes.isEmpty() && !m_hasEndEventConditions)
                     break;
             }
             tempEnd = resolveActiveEnd(tempBegin, tempEnd);
         }
-        if (!first || (tempEnd > 0 || (!tempBegin.value() && !tempEnd.value()))) {
-            beginResult = tempBegin;
-            endResult = tempEnd;
-            return;
-        }
+        if (!first || (tempEnd > 0 || (!tempBegin.value() && !tempEnd.value())))
+            return SMILInterval(tempBegin, tempEnd);
 
         beginAfter = tempEnd;
         lastIntervalTempEnd = tempEnd;
     }
-    beginResult = SMILTime::unresolved();
-    endResult = SMILTime::unresolved();
+    return SMILInterval(SMILTime::unresolved(), SMILTime::unresolved());
 }
 
 void SVGSMILElement::resolveFirstInterval()
 {
-    SMILInterval firstInterval;
-    resolveInterval(true, firstInterval.begin, firstInterval.end);
+    SMILInterval firstInterval = resolveInterval(FirstInterval);
     ASSERT(!firstInterval.begin.isIndefinite());
 
-    if (!firstInterval.begin.isUnresolved() && firstInterval != SMILInterval(m_interval.begin, m_interval.end)) {
-        m_interval.begin = firstInterval.begin;
-        m_interval.end = firstInterval.end;
+    if (!firstInterval.begin.isUnresolved() && firstInterval != m_interval) {
+        m_interval = firstInterval;
         notifyDependentsIntervalChanged();
         m_nextProgressTime = min(m_nextProgressTime, m_interval.begin);
 
         if (m_timeContainer)
             m_timeContainer->notifyIntervalsChanged();
     }
 }
 
 bool SVGSMILElement::resolveNextInterval()
 {
-    SMILTime begin;
-    SMILTime end;
-    resolveInterval(false, begin, end);
-    ASSERT(!begin.isIndefinite());
+    SMILInterval nextInterval = resolveInterval(NextInterval);
+    ASSERT(!nextInterval.begin.isIndefinite());
 
-    if (!begin.isUnresolved() && begin != m_interval.begin) {
-        m_interval.begin = begin;
-        m_interval.end = end;
+    if (!nextInterval.begin.isUnresolved() && nextInterval.begin != m_interval.begin) {
+        m_interval = nextInterval;
         notifyDependentsIntervalChanged();
         m_nextProgressTime = min(m_nextProgressTime, m_interval.begin);
         return true;
     }
 
     return false;
 }
 
 SMILTime SVGSMILElement::nextProgressTime() const
 {
     return m_nextProgressTime;
 }
 
 void SVGSMILElement::beginListChanged(SMILTime eventTime)
 {
     if (m_isWaitingForFirstInterval)
         resolveFirstInterval();
     else {
         SMILTime newBegin = findInstanceTime(Begin, eventTime, true);
         if (newBegin.isFinite() && (m_interval.end <= eventTime || newBegin < m_interval.begin)) {
             // Begin time changed, re-resolve the interval.
             SMILTime oldBegin = m_interval.begin;
             m_interval.end = eventTime;
-            resolveInterval(false, m_interval.begin, m_interval.end);
+            m_interval = resolveInterval(NextInterval);
             ASSERT(!m_interval.begin.isUnresolved());
             if (m_interval.begin != oldBegin) {
                 if (m_activeState == Active && m_interval.begin > eventTime) {
                     m_activeState = determineActiveState(eventTime);
                     if (m_activeState != Active)
                         endedActiveInterval();
                 }
                 notifyDependentsIntervalChanged();
             }
         }
@@ skipping 357 matching lines @@
 void SVGSMILElement::trace(Visitor* visitor)
 {
     visitor->trace(m_targetElement);
     visitor->trace(m_timeContainer);
     visitor->trace(m_conditions);
     visitor->trace(m_syncBaseDependents);
     SVGElement::trace(visitor);
 }
 
 }