summaryrefslogtreecommitdiff
path: root/Source/WebCore/svg/animation/SMILTimeContainer.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/svg/animation/SMILTimeContainer.h')
-rw-r--r--Source/WebCore/svg/animation/SMILTimeContainer.h20
1 files changed, 7 insertions, 13 deletions
diff --git a/Source/WebCore/svg/animation/SMILTimeContainer.h b/Source/WebCore/svg/animation/SMILTimeContainer.h
index 4a3efa096..861665efa 100644
--- a/Source/WebCore/svg/animation/SMILTimeContainer.h
+++ b/Source/WebCore/svg/animation/SMILTimeContainer.h
@@ -23,17 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SMILTimeContainer_h
-#define SMILTimeContainer_h
-
-#if ENABLE(SVG)
+#pragma once
#include "QualifiedName.h"
#include "SMILTime.h"
#include "Timer.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
@@ -44,9 +40,9 @@ class SVGElement;
class SVGSMILElement;
class SVGSVGElement;
-class SMILTimeContainer : public RefCounted<SMILTimeContainer> {
+class SMILTimeContainer final : public RefCounted<SMILTimeContainer> {
public:
- static PassRefPtr<SMILTimeContainer> create(SVGSVGElement* owner) { return adoptRef(new SMILTimeContainer(owner)); }
+ static Ref<SMILTimeContainer> create(SVGSVGElement* owner) { return adoptRef(*new SMILTimeContainer(owner)); }
~SMILTimeContainer();
void schedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
@@ -69,8 +65,8 @@ public:
private:
SMILTimeContainer(SVGSVGElement* owner);
- void timerFired(Timer<SMILTimeContainer>*);
- void startTimer(SMILTime fireTime, SMILTime minimumDelay = 0);
+ void timerFired();
+ void startTimer(SMILTime elapsed, SMILTime fireTime, SMILTime minimumDelay = 0);
void updateAnimations(SMILTime elapsed, bool seekToTime = false);
void updateDocumentOrderIndexes();
@@ -84,7 +80,7 @@ private:
bool m_documentOrderIndexesDirty;
- Timer<SMILTimeContainer> m_timer;
+ Timer m_timer;
typedef std::pair<SVGElement*, QualifiedName> ElementAttributePair;
typedef Vector<SVGSMILElement*> AnimationsVector;
@@ -97,7 +93,5 @@ private:
bool m_preventScheduledAnimationsChanges;
#endif
};
-}
-#endif // ENABLE(SVG)
-#endif // SMILTimeContainer_h
+} // namespace WebCore