Changeset 248406 in webkit

Timestamp:

Aug 8, 2019 7:13:20 AM (5 years ago)

Author:

magomez@igalia.com

Message:

[GTK][WPE] Remove the reference to WebCore::Animation from TextureMapperAnimation
​https://bugs.webkit.org/show_bug.cgi?id=200533

Reviewed by Žan Doberšek.

Pass the relevant parameters to TextureMapperAnimation instead of creating a new WebCore::Animation
inside it.

• platform/graphics/texmap/TextureMapperAnimation.cpp:

(WebCore::timingFunctionForAnimationValue):
(WebCore::TextureMapperAnimation::TextureMapperAnimation):
(WebCore::TextureMapperAnimation::apply):
(WebCore::TextureMapperAnimation::isActive const):

• platform/graphics/texmap/TextureMapperAnimation.h:

(WebCore::TextureMapperAnimation::keyframes const):
(WebCore::TextureMapperAnimation::timingFunction const):
(WebCore::TextureMapperAnimation::animation const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperAnimation.cpp (modified) (7 diffs)
• platform/graphics/texmap/TextureMapperAnimation.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-08  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK][WPE] Remove the reference to WebCore::Animation from TextureMapperAnimation
+        https://bugs.webkit.org/show_bug.cgi?id=200533
+
+        Reviewed by Žan Doberšek.
+
+        Pass the relevant parameters to TextureMapperAnimation instead of creating a new WebCore::Animation
+        inside it.
+
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        (WebCore::timingFunctionForAnimationValue):
+        (WebCore::TextureMapperAnimation::TextureMapperAnimation):
+        (WebCore::TextureMapperAnimation::apply):
+        (WebCore::TextureMapperAnimation::isActive const):
+        * platform/graphics/texmap/TextureMapperAnimation.h:
+        (WebCore::TextureMapperAnimation::keyframes const):
+        (WebCore::TextureMapperAnimation::timingFunction const):
+        (WebCore::TextureMapperAnimation::animation const): Deleted.
+
 2019-08-08  Charlie Turner  <cturner@igalia.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp

@@ -156 +156 @@
 }
 
-static const TimingFunction& timingFunctionForAnimationValue(const AnimationValue& animationValue, const Animation& animation)
+static const TimingFunction& timingFunctionForAnimationValue(const AnimationValue& animationValue, const TextureMapperAnimation& animation)
 {
     if (animationValue.timingFunction())
@@ -169 +169 @@
     , m_keyframes(keyframes)
     , m_boxSize(boxSize)
-    , m_animation(Animation::create(animation))
+    , m_timingFunction(animation.timingFunction()->clone())
+    , m_iterationCount(animation.iterationCount())
+    , m_duration(animation.duration())
+    , m_direction(animation.direction())
+    , m_fillsForwards(animation.fillsForwards())
     , m_listsMatch(listsMatch)
     , m_startTime(startTime)
@@ -183 +187 @@
     , m_keyframes(other.m_keyframes)
     , m_boxSize(other.m_boxSize)
-    , m_animation(Animation::create(*other.m_animation))
+    , m_timingFunction(other.m_timingFunction->clone())
+    , m_iterationCount(other.m_iterationCount)
+    , m_duration(other.m_duration)
+    , m_direction(other.m_direction)
+    , m_fillsForwards(other.m_fillsForwards)
     , m_listsMatch(other.m_listsMatch)
     , m_startTime(other.m_startTime)
@@ -199 +207 @@
 
     Seconds totalRunningTime = computeTotalRunningTime(time);
-    double normalizedValue = normalizedAnimationValue(totalRunningTime.seconds(), m_animation->duration(), m_animation->direction(), m_animation->iterationCount());
-
-    if (m_animation->iterationCount() != Animation::IterationCountInfinite && totalRunningTime.seconds() >= m_animation->duration() * m_animation->iterationCount()) {
+    double normalizedValue = normalizedAnimationValue(totalRunningTime.seconds(), m_duration, m_direction, m_iterationCount);
+
+    if (m_iterationCount != Animation::IterationCountInfinite && totalRunningTime.seconds() >= m_duration * m_iterationCount) {
         m_state = AnimationState::Stopped;
         m_pauseTime = 0_s;
-        if (m_animation->fillsForwards())
-            normalizedValue = normalizedAnimationValueForFillsForwards(m_animation->iterationCount(), m_animation->direction());
+        if (m_fillsForwards)
+            normalizedValue = normalizedAnimationValueForFillsForwards(m_iterationCount, m_direction);
     }
 
@@ -220 +228 @@
     }
     if (m_keyframes.size() == 2) {
-        auto& timingFunction = timingFunctionForAnimationValue(m_keyframes.at(0), *m_animation);
-        normalizedValue = timingFunction.transformTime(normalizedValue, m_animation->duration());
+        auto& timingFunction = timingFunctionForAnimationValue(m_keyframes.at(0), *this);
+        normalizedValue = timingFunction.transformTime(normalizedValue, m_duration);
         applyInternal(applicationResults, m_keyframes.at(0), m_keyframes.at(1), normalizedValue);
         return;
@@ -233 +241 @@
 
         normalizedValue = (normalizedValue - from.keyTime()) / (to.keyTime() - from.keyTime());
-        auto& timingFunction = timingFunctionForAnimationValue(from, *m_animation);
-        normalizedValue = timingFunction.transformTime(normalizedValue, m_animation->duration());
+        auto& timingFunction = timingFunctionForAnimationValue(from, *this);
+        normalizedValue = timingFunction.transformTime(normalizedValue, m_duration);
         applyInternal(applicationResults, from, to, normalizedValue);
         break;
@@ -282 +290 @@
 bool TextureMapperAnimation::isActive() const
 {
-    return m_state != AnimationState::Stopped || m_animation->fillsForwards();
+    return m_state != AnimationState::Stopped || m_fillsForwards;
 }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h

@@ -52 +52 @@
     const String& name() const { return m_name; }
     const KeyframeValueList& keyframes() const { return m_keyframes; }
-    const RefPtr<Animation> animation() const { return m_animation; }
     AnimationState state() const { return m_state; }
+    TimingFunction* timingFunction() const { return m_timingFunction.get(); }
 
 private:
@@ -62 +62 @@
     KeyframeValueList m_keyframes;
     FloatSize m_boxSize;
-    RefPtr<Animation> m_animation;
+    RefPtr<TimingFunction> m_timingFunction;
+    double m_iterationCount;
+    double m_duration;
+    Animation::AnimationDirection m_direction;
+    bool m_fillsForwards;
     bool m_listsMatch;
     MonotonicTime m_startTime;