Tidy up instance time handling in SVGSMILElement

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h

 /*
  * 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 109 matching lines @@
 
   void scheduleEvent(const AtomicString& eventType);
   void scheduleRepeatEvents(unsigned);
   void dispatchPendingEvent(const AtomicString& eventType);
 
   virtual bool isSVGDiscardElement() const { return false; }
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
-  void addBeginTime(
-      SMILTime eventTime,
-      SMILTime endTime,
-      SMILTimeWithOrigin::Origin = SMILTimeWithOrigin::ParserOrigin);
-  void addEndTime(
-      SMILTime eventTime,
-      SMILTime endTime,
+  enum BeginOrEnd { Begin, End };
+
+  void addInstanceTime(
+      BeginOrEnd,
+      SMILTime,
       SMILTimeWithOrigin::Origin = SMILTimeWithOrigin::ParserOrigin);
 
   void setInactive() { m_activeState = Inactive; }
 
   // Sub-classes may need to take action when the target is changed.
   virtual void setTargetElement(SVGElement*);
 
   void schedule();
   void unscheduleIfScheduled();
 
   QualifiedName m_attributeName;
 
  private:
   void buildPendingResource() override;
   void clearResourceAndEventBaseReferences();
   void clearConditions();
 
   virtual void startedActiveInterval() = 0;
   void endedActiveInterval();
   virtual void updateAnimation(float percent,
                                unsigned repeat,
                                SVGSMILElement* resultElement) = 0;
 
   bool layoutObjectIsNeeded(const ComputedStyle&) override { return false; }
 
-  enum BeginOrEnd { Begin, End };
-
   SMILTime findInstanceTime(BeginOrEnd,
                             SMILTime minimumTime,
                             bool equalsMinimumOK) const;
 
   enum IntervalSelector { FirstInterval, NextInterval };
 
   SMILInterval resolveInterval(IntervalSelector) const;
   void resolveFirstInterval();
   bool resolveNextInterval();
   SMILTime resolveActiveEnd(SMILTime resolvedBegin, SMILTime resolvedEnd) const;
@@ skipping 56 matching lines @@
     int m_repeat;
     Member<SVGSMILElement> m_syncBase;
     Member<ConditionEventListener> m_eventListener;
   };
   bool parseCondition(const String&, BeginOrEnd beginOrEnd);
   void parseBeginOrEnd(const String&, BeginOrEnd beginOrEnd);
 
   void disconnectSyncBaseConditions();
   void disconnectEventBaseConditions();
 
-  // Event base timing
-  void handleConditionEvent(Event*, Condition*);
-
   void notifyDependentsIntervalChanged();
   void createInstanceTimesFromSyncbase(SVGSMILElement& syncbase);
   void addSyncBaseDependent(SVGSMILElement&);
   void removeSyncBaseDependent(SVGSMILElement&);
 
   enum ActiveState { Inactive, Active, Frozen };
 
   ActiveState determineActiveState(SMILTime elapsed) const;
   float calculateAnimationPercentAndRepeat(double elapsed,
                                            unsigned& repeat) const;
@@ skipping 48 matching lines @@
          element.hasTagName(SVGNames::animateMotionTag) ||
          element.hasTagName(SVGNames::animateTransformTag) ||
          element.hasTagName((SVGNames::discardTag));
 }
 
 DEFINE_SVGELEMENT_TYPE_CASTS_WITH_FUNCTION(SVGSMILElement);
 
 }  // namespace blink
 
 #endif  // SVGSMILElement_h