Tidy up event-/syncbase registration 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 168 matching lines @@
   void beginListChanged(SMILTime eventTime);
   void endListChanged(SMILTime eventTime);
 
   // 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" ... />
   class Condition : public GarbageCollectedFinalized<Condition> {
    public:
     enum Type { EventBase, Syncbase, AccessKey };
 
-    Condition(Type,
-              BeginOrEnd,
-              const String& baseID,
-              const String& name,
-              SMILTime offset,
-              int repeat = -1);
     static Condition* create(Type type,
                              BeginOrEnd beginOrEnd,
-                             const String& baseID,
-                             const String& name,
+                             const AtomicString& baseID,
+                             const AtomicString& name,
                              SMILTime offset,
                              int repeat = -1) {
       return new Condition(type, beginOrEnd, baseID, name, offset, repeat);
     }
     ~Condition();
     DECLARE_TRACE();
 
     Type getType() const { return m_type; }
     BeginOrEnd getBeginOrEnd() const { return m_beginOrEnd; }
-    String baseID() const { return m_baseID; }
-    String name() const { return m_name; }
+    const AtomicString& name() const { return m_name; }
     SMILTime offset() const { return m_offset; }
     int repeat() const { return m_repeat; }
-    SVGSMILElement* syncBase() const { return m_syncBase.get(); }
-    void setSyncBase(SVGSMILElement* element) { m_syncBase = element; }
-    ConditionEventListener* eventListener() const {
-      return m_eventListener.get();
+
+    void connectSyncBase(SVGSMILElement&);
+    void disconnectSyncBase(SVGSMILElement&);
+    bool syncBaseEquals(SVGSMILElement& timedElement) const {
+      return m_syncBase == timedElement;
     }
-    void setEventListener(ConditionEventListener*);
+
+    void connectEventBase(SVGSMILElement&);
+    void disconnectEventBase(SVGSMILElement&);
 
    private:
+    Condition(Type,
+              BeginOrEnd,
+              const AtomicString& baseID,
+              const AtomicString& name,
+              SMILTime offset,
+              int repeat);
+
+    SVGElement* lookupEventBase(SVGSMILElement&) const;
+
     Type m_type;
     BeginOrEnd m_beginOrEnd;
-    String m_baseID;
-    String m_name;
+    AtomicString m_baseID;
+    AtomicString m_name;
     SMILTime m_offset;
     int m_repeat;
     Member<SVGSMILElement> m_syncBase;
     Member<ConditionEventListener> m_eventListener;
   };
   bool parseCondition(const String&, BeginOrEnd beginOrEnd);
   void parseBeginOrEnd(const String&, BeginOrEnd beginOrEnd);
-  SVGElement* eventBaseFor(const Condition&);
 
   void disconnectSyncBaseConditions();
   void disconnectEventBaseConditions();
 
   // Event base timing
   void handleConditionEvent(Event*, Condition*);
 
   void notifyDependentsIntervalChanged();
-  void createInstanceTimesFromSyncbase(SVGSMILElement* syncbase);
-  void addSyncBaseDependent(SVGSMILElement*);
-  void removeSyncBaseDependent(SVGSMILElement*);
+  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;
   SMILTime calculateNextProgressTime(double elapsed) const;
 
   Member<SVGElement> m_targetElement;
 
@@ skipping 44 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