Changeset 190890 in webkit

Timestamp:

Oct 12, 2015 2:48:32 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[SVG] Handle endEvent for svg animations
​https://bugs.webkit.org/show_bug.cgi?id=121587

Patch by Antoine Quint <Antoine Quint> on 2015-10-12
Reviewed by Dean Jackson.

Source/WebCore:

Add support for the "endEvent" SVG event triggered when an animation completes, as
specified in ​http://www.w3.org/TR/SMIL3/smil-timing.html#q135. This event doesn't
bubble and can't be canceled. Added test coverage for the event through the DOM
Events API as well as the declarative SMIL Animation syntax.

Adapted from a Chromium patch by ​pavan.e@samsung.com
​https://chromium.googlesource.com/chromium/blink/+/4d415ca0268231aa80e3552fe21bf3480a6978f8

Tests: svg/animations/end-event-declarative-expected.svg

svg/animations/end-event-declarative.svg
svg/animations/end-event-script-expected.svg
svg/animations/end-event-script.svg

• svg/animation/SMILTimeContainer.cpp:

(WebCore::SMILTimeContainer::updateAnimations):

• svg/animation/SVGSMILElement.cpp:

(WebCore::smilEndEventSender):
(WebCore::SVGSMILElement::~SVGSMILElement):
(WebCore::SVGSMILElement::progress):
(WebCore::SVGSMILElement::dispatchPendingEvent):

• svg/animation/SVGSMILElement.h:

(WebCore::SVGSMILElement::hasConditionsConnected):

LayoutTests:

Tests for the "endEvent" event for SVG animations.

• svg/animations/end-event-declarative-expected.svg: Added.
• svg/animations/end-event-declarative.svg: Added.
• svg/animations/end-event-script-expected.svg: Added.
• svg/animations/end-event-script.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/end-event-declarative-expected.svg (added)
• LayoutTests/svg/animations/end-event-declarative.svg (added)
• LayoutTests/svg/animations/end-event-script-expected.svg (added)
• LayoutTests/svg/animations/end-event-script.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/animation/SMILTimeContainer.cpp (modified) (1 diff)
• Source/WebCore/svg/animation/SVGSMILElement.cpp (modified) (6 diffs)
• Source/WebCore/svg/animation/SVGSMILElement.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-12  Antoine Quint  <graouts@apple.com>
+
+        [SVG] Handle endEvent for svg animations
+        https://bugs.webkit.org/show_bug.cgi?id=121587
+
+        Reviewed by Dean Jackson.
+
+        Tests for the "endEvent" event for SVG animations.
+
+        * svg/animations/end-event-declarative-expected.svg: Added.
+        * svg/animations/end-event-declarative.svg: Added.
+        * svg/animations/end-event-script-expected.svg: Added.
+        * svg/animations/end-event-script.svg: Added.
+
 2015-10-12  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-12  Antoine Quint  <graouts@apple.com>
+
+        [SVG] Handle endEvent for svg animations
+        https://bugs.webkit.org/show_bug.cgi?id=121587
+
+        Reviewed by Dean Jackson.
+
+        Add support for the "endEvent" SVG event triggered when an animation completes, as
+        specified in http://www.w3.org/TR/SMIL3/smil-timing.html#q135. This event doesn't
+        bubble and can't be canceled. Added test coverage for the event through the DOM
+        Events API as well as the declarative SMIL Animation syntax.
+
+        Adapted from a Chromium patch by pavan.e@samsung.com
+        https://chromium.googlesource.com/chromium/blink/+/4d415ca0268231aa80e3552fe21bf3480a6978f8
+
+        Tests: svg/animations/end-event-declarative-expected.svg
+               svg/animations/end-event-declarative.svg
+               svg/animations/end-event-script-expected.svg
+               svg/animations/end-event-script.svg
+
+        * svg/animation/SMILTimeContainer.cpp:
+        (WebCore::SMILTimeContainer::updateAnimations):
+        * svg/animation/SVGSMILElement.cpp:
+        (WebCore::smilEndEventSender):
+        (WebCore::SVGSMILElement::~SVGSMILElement):
+        (WebCore::SVGSMILElement::progress):
+        (WebCore::SVGSMILElement::dispatchPendingEvent):
+        * svg/animation/SVGSMILElement.h:
+        (WebCore::SVGSMILElement::hasConditionsConnected):
+
 2015-10-12  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp

@@ -265 +265 @@
     for (auto& it : m_scheduledAnimations) {
         AnimationsVector* scheduled = it.value.get();
+        for (auto* animation : *scheduled) {
+            if (!animation->hasConditionsConnected())
+                animation->connectConditions();
+        }
+    }
+    
+    for (auto& it : m_scheduledAnimations) {
+        AnimationsVector* scheduled = it.value.get();
 
         // Sort according to priority. Elements with later begin time have higher priority.

trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp

@@ -31 +31 @@
 #include "Event.h"
 #include "EventListener.h"
+#include "EventSender.h"
 #include "FloatConversion.h"
 #include "FrameView.h"
@@ -46 +47 @@
 
 namespace WebCore {
-    
+
+static SMILEventSender& smilEndEventSender()
+{
+    static NeverDestroyed<SMILEventSender> sender("endEvent");
+    return sender;
+}
+
 // This is used for duration type time values that can't be negative.
 static const double invalidCachedTime = -1.;
@@ -136 +143 @@
 {
     clearResourceReferences();
+    smilEndEventSender().cancelEvent(*this);
     disconnectConditions();
     if (m_timeContainer && m_targetElement && hasValidAttributeName())
@@ -1049 +1057 @@
     ASSERT(m_isWaitingForFirstInterval || m_intervalBegin.isFinite());
 
-    if (!m_conditionsConnected)
-        connectConditions();
-
     if (!m_intervalBegin.isFinite()) {
         ASSERT(m_activeState == Inactive);
@@ -1108 +1113 @@
 
     if (oldActiveState == Active && m_activeState != Active) {
+        smilEndEventSender().dispatchEventSoon(*this);
         endedActiveInterval();
         if (m_activeState != Frozen)
             clearAnimatedType(m_targetElement);
+    }
+
+    // Triggering all the pending events if the animation timeline is changed.
+    if (seekToTime) {
+        if (m_activeState == Inactive || m_activeState == Frozen)
+            smilEndEventSender().dispatchEventSoon(*this);
     }
 
@@ -1188 +1200 @@
 }
 
-}
+void SVGSMILElement::dispatchPendingEvent(SMILEventSender* eventSender)
+{
+    ASSERT(eventSender == &smilEndEventSender());
+    const AtomicString& eventType = eventSender->eventType();
+    dispatchEvent(Event::create(eventType, false, false));
+}
+
+}

trunk/Source/WebCore/svg/animation/SVGSMILElement.h

@@ -34 +34 @@
 namespace WebCore {
 
+class SVGSMILElement;
+
+template<typename T> class EventSender;
+typedef EventSender<SVGSMILElement> SMILEventSender;
+
 class ConditionEventListener;
 class SMILTimeContainer;
@@ -107 +112 @@
     virtual void clearAnimatedType(SVGElement* targetElement) = 0;
     virtual void applyResultsToTarget() = 0;
+
+    void connectConditions();
+    bool hasConditionsConnected() const { return m_conditionsConnected; }
+    
+    void dispatchPendingEvent(SMILEventSender*);
 
 protected:
@@ -169 +179 @@
     Element* eventBaseFor(const Condition&);
 
-    void connectConditions();
     void disconnectConditions();