Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1319)

Unified Diff: Source/core/svg/animation/SVGSMILElement.h

Issue 102353003: [SVG] Refactoring the logic to handle eventBase dependency (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed assert crash Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/svg/animation/SVGSMILElement.h
diff --git a/Source/core/svg/animation/SVGSMILElement.h b/Source/core/svg/animation/SVGSMILElement.h
index 6016f5bdadd71444592a9acb363dd8de778789c5..52ab142b6e3f16a31a053a244709c338a4b15851 100644
--- a/Source/core/svg/animation/SVGSMILElement.h
+++ b/Source/core/svg/animation/SVGSMILElement.h
@@ -109,7 +109,8 @@ public:
virtual void clearAnimatedType(SVGElement* targetElement) = 0;
virtual void applyResultsToTarget() = 0;
- void connectConditions();
+ void connectSyncBaseConditions();
+ void connectEventBaseConditions();
void dispatchPendingEvent(SMILEventSender*);
void dispatchRepeatEvents(unsigned);
@@ -126,7 +127,7 @@ protected:
private:
void buildPendingResource();
- void clearResourceReferences();
+ void clearResourceAndEventBaseReferences();
virtual void startedActiveInterval() = 0;
void endedActiveInterval();
@@ -172,15 +173,16 @@ private:
void parseBeginOrEnd(const String&, BeginOrEnd beginOrEnd);
Element* eventBaseFor(const Condition&);
- void disconnectConditions();
+ void disconnectSyncBaseConditions();
+ void disconnectEventBaseConditions();
// Event base timing
void handleConditionEvent(Event*, Condition*);
void notifyDependentsIntervalChanged();
void createInstanceTimesFromSyncbase(SVGSMILElement* syncbase);
- void addTimeDependent(SVGSMILElement*);
- void removeTimeDependent(SVGSMILElement*);
+ void addSyncBaseDependent(SVGSMILElement*);
+ void removeSyncBaseDependent(SVGSMILElement*);
enum ActiveState {
Inactive,
@@ -197,13 +199,13 @@ private:
mutable SVGElement* m_targetElement;
Vector<Condition> m_conditions;
- bool m_conditionsConnected;
+ bool m_syncBaseConditionsConnected;
bool m_hasEndEventConditions;
bool m_isWaitingForFirstInterval;
typedef HashSet<SVGSMILElement*> TimeDependentSet;
- TimeDependentSet m_timeDependents;
+ TimeDependentSet m_syncBaseDependents;
// Instance time lists
Vector<SMILTimeWithOrigin> m_beginTimes;
« no previous file with comments | « LayoutTests/svg/animations/repeatn-remove-add-animation-expected.txt ('k') | Source/core/svg/animation/SVGSMILElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698