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

Source/WebCore/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 14 matching lines @@
 
 #ifndef SVGSMILElement_h
 #define SVGSMILElement_h
 #if ENABLE(SVG)
 #include "SMILTime.h"
 #include "SVGElement.h"
 
 #include <wtf/HashMap.h>
 
 namespace WebCore {
-    
+
+enum ResolveTarget { DoNotResolveNewTarget, ResolveNewTarget };
+
 class ConditionEventListener;
 class SMILTimeContainer;
 
 // This class implements SMIL interval timing model as needed for SVG animation.
 class SVGSMILElement : public SVGElement {
 public:
     SVGSMILElement(const QualifiedName&, Document*);
     virtual ~SVGSMILElement();
 
     static bool isSMILElement(Node*);
 
     bool isSupportedAttribute(const QualifiedName&);
     virtual void parseAttribute(const Attribute&) OVERRIDE;
     virtual void svgAttributeChanged(const QualifiedName&) OVERRIDE;
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
     virtual void removedFrom(ContainerNode*) OVERRIDE;
     
     virtual bool hasValidAttributeType() = 0;
+    virtual bool hasValidAttributeName();
     virtual void animationAttributeChanged() = 0;
 
     SMILTimeContainer* timeContainer() const { return m_timeContainer.get(); }
 
     SVGElement* targetElement();
-    void resetTargetElement();
+    void resetTargetElement(ResolveTarget = ResolveNewTarget);
     const QualifiedName& attributeName() const { return m_attributeName; }
 
     void beginByLinkActivation();
 
     enum Restart {
         RestartAlways,
         RestartWhenNotActive,
         RestartNever
     };
 
@@ skipping 61 matching lines @@
     
     SMILTime findInstanceTime(BeginOrEnd, SMILTime minimumTime, bool equalsMinimumOK) const;
     void resolveFirstInterval();
     void resolveNextInterval(bool notifyDependents);
     void resolveInterval(bool first, SMILTime& beginResult, SMILTime& endResult) const;
     SMILTime resolveActiveEnd(SMILTime resolvedBegin, SMILTime resolvedEnd) const;
     SMILTime repeatingDuration() const;
     void checkRestart(SMILTime elapsed);
     void beginListChanged(SMILTime eventTime);
     void endListChanged(SMILTime eventTime);
-    void reschedule();
+
+    void setAttributeName(const QualifiedName&);
 
     // This represents conditions on elements begin or end list that need to be resolved on runtime
     // for example <animate begin="otherElement.begin + 8s; button.click" ... />
     struct Condition {
         enum Type {
             EventBase,
             Syncbase,
             AccessKey
         };
 
@@ skipping 76 matching lines @@
     mutable SMILTime m_cachedMin;
     mutable SMILTime m_cachedMax;
 
     friend class ConditionEventListener;
 };
 
 }
 
 #endif // ENABLE(SVG)
 #endif // SVGSMILElement_h