Merge 129670 - Refactor SMILTimeContainer to maintain animation information instead of recalculatin…

Source/WebCore/svg/animation/SMILTimeContainer.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 28 matching lines @@
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
     
 class SVGElement;
 class SVGSMILElement;
 class SVGSVGElement;
 
 class SMILTimeContainer : public RefCounted<SMILTimeContainer>  {
 public:
-    static PassRefPtr<SMILTimeContainer> create(SVGSVGElement* owner) { return adoptRef(new SMILTimeContainer(owner)); } 
+    static PassRefPtr<SMILTimeContainer> create(SVGSVGElement* owner) { return adoptRef(new SMILTimeContainer(owner)); }
+    ~SMILTimeContainer();
 
-    void schedule(SVGSMILElement*);
-    void unschedule(SVGSMILElement*);
-    
+    void schedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
+    void unschedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
+    void notifyIntervalsChanged();
+
     SMILTime elapsed() const;
 
     bool isActive() const;
     bool isPaused() const;
     bool isStarted() const;
-    
+
     void begin();
     void pause();
     void resume();
     void setElapsed(SMILTime);
 
     void setDocumentOrderIndexesDirty() { m_documentOrderIndexesDirty = true; }
 
 private:
     SMILTimeContainer(SVGSVGElement* owner);
-    
+
     void timerFired(Timer<SMILTimeContainer>*);
     void startTimer(SMILTime fireTime, SMILTime minimumDelay = 0);
     void updateAnimations(SMILTime elapsed, bool seekToTime = false);
     
     void updateDocumentOrderIndexes();
     void sortByPriority(Vector<SVGSMILElement*>& smilElements, SMILTime elapsed);
-    
+
     double m_beginTime;
     double m_pauseTime;
     double m_accumulatedPauseTime;
     double m_presetStartTime;
 
     bool m_documentOrderIndexesDirty;
     
     Timer<SMILTimeContainer> m_timer;
 
-    typedef HashSet<SVGSMILElement*> TimingElementSet;
-    TimingElementSet m_scheduledAnimations;
+    typedef pair<SVGElement*, QualifiedName> ElementAttributePair;
+    typedef Vector<SVGSMILElement*> AnimationsVector;
+    typedef HashMap<ElementAttributePair, AnimationsVector* > GroupedAnimationsMap;
+    GroupedAnimationsMap m_scheduledAnimations;
 
     SVGSVGElement* m_ownerSVGElement;
+
+#ifndef NDEBUG
+    bool m_preventScheduledAnimationsChanges;
+#endif
 };
 }
 
 #endif // ENABLE(SVG)
 #endif // SMILTimeContainer_h