Changeset 229317 in webkit

Timestamp:

Mar 6, 2018 3:51:53 AM (6 years ago)

Author:

zandobersek@gmail.com

Message:

[CoordGraphics] Apply TextureMapperLayer animations with a single MonotonicTime value
​https://bugs.webkit.org/show_bug.cgi?id=183360

Reviewed by Sergio Villar Senin.

Source/WebCore:

When animations are being applied on the TextureMapperLayer tree, the
monotonic time value is retrieved repeatedly in TextureMapperAnimation
class. Instead of spawning repeated syscalls that are required to obtain
the time value, TextureMapperLayer::applyAnimationsRecursively() now
accepts a MonotonicTime value that should be used for all animation
updates.

No new tests -- no change in behavior.

• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:

(WebCore::GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly):

• platform/graphics/texmap/TextureMapperAnimation.cpp:

(WebCore::TextureMapperAnimation::apply):
(WebCore::TextureMapperAnimation::computeTotalRunningTime):
(WebCore::TextureMapperAnimations::apply):

• platform/graphics/texmap/TextureMapperAnimation.h:

(WebCore::TextureMapperAnimation::keyframes const):
(WebCore::TextureMapperAnimation::animation const):
(WebCore::TextureMapperAnimation::boxSize const): Deleted.
(WebCore::TextureMapperAnimation::listsMatch const): Deleted.
(WebCore::TextureMapperAnimation::startTime const): Deleted.
(WebCore::TextureMapperAnimation::pauseTime const): Deleted.

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::applyAnimationsRecursively):
(WebCore::TextureMapperLayer::syncAnimations):

• platform/graphics/texmap/TextureMapperLayer.h:

Source/WebKit:

• Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:

(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
Pass the monotic time value, as returned by MonotonicTime::now(), to the
TextureMapperLayer::applyAnimationsRecursively() call.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (1 diff)
• WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp (modified) (4 diffs)
• WebCore/platform/graphics/texmap/TextureMapperAnimation.h (modified) (3 diffs)
• WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/texmap/TextureMapperLayer.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CoordGraphics] Apply TextureMapperLayer animations with a single MonotonicTime value
+        https://bugs.webkit.org/show_bug.cgi?id=183360
+
+        Reviewed by Sergio Villar Senin.
+
+        When animations are being applied on the TextureMapperLayer tree, the
+        monotonic time value is retrieved repeatedly in TextureMapperAnimation
+        class. Instead of spawning repeated syscalls that are required to obtain
+        the time value, TextureMapperLayer::applyAnimationsRecursively() now
+        accepts a MonotonicTime value that should be used for all animation
+        updates.
+
+        No new tests -- no change in behavior.
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly):
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        (WebCore::TextureMapperAnimation::apply):
+        (WebCore::TextureMapperAnimation::computeTotalRunningTime):
+        (WebCore::TextureMapperAnimations::apply):
+        * platform/graphics/texmap/TextureMapperAnimation.h:
+        (WebCore::TextureMapperAnimation::keyframes const):
+        (WebCore::TextureMapperAnimation::animation const):
+        (WebCore::TextureMapperAnimation::boxSize const): Deleted.
+        (WebCore::TextureMapperAnimation::listsMatch const): Deleted.
+        (WebCore::TextureMapperAnimation::startTime const): Deleted.
+        (WebCore::TextureMapperAnimation::pauseTime const): Deleted.
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::applyAnimationsRecursively):
+        (WebCore::TextureMapperLayer::syncAnimations):
+        * platform/graphics/texmap/TextureMapperLayer.h:
+
 2018-03-06  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -367 +367 @@
     prepareBackingStoreIfNeeded();
     commitLayerChanges();
-    m_layer.syncAnimations();
+    m_layer.syncAnimations(MonotonicTime::now());
 }
 

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

@@ -193 +193 @@
 }
 
-void TextureMapperAnimation::apply(Client& client)
+void TextureMapperAnimation::apply(Client& client, MonotonicTime time)
 {
     if (!isActive())
         return;
 
-    Seconds totalRunningTime = computeTotalRunningTime();
+    Seconds totalRunningTime = computeTotalRunningTime(time);
     double normalizedValue = normalizedAnimationValue(totalRunningTime.seconds(), m_animation->duration(), m_animation->direction(), m_animation->iterationCount());
 
@@ -254 +254 @@
 }
 
-Seconds TextureMapperAnimation::computeTotalRunningTime()
+Seconds TextureMapperAnimation::computeTotalRunningTime(MonotonicTime time)
 {
     if (m_state == AnimationState::Paused)
@@ -260 +260 @@
 
     MonotonicTime oldLastRefreshedTime = m_lastRefreshedTime;
-    m_lastRefreshedTime = MonotonicTime::now();
+    m_lastRefreshedTime = time;
     m_totalRunningTime += m_lastRefreshedTime - oldLastRefreshedTime;
     return m_totalRunningTime;
@@ -331 +331 @@
 }
 
-void TextureMapperAnimations::apply(TextureMapperAnimation::Client& client)
+void TextureMapperAnimations::apply(TextureMapperAnimation::Client& client, MonotonicTime time)
 {
     for (auto& animation : m_animations)
-        animation.apply(client);
+        animation.apply(client, time);
 }
 

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

@@ -44 +44 @@
     WEBCORE_EXPORT TextureMapperAnimation(const TextureMapperAnimation&);
 
-    void apply(Client&);
+    void apply(Client&, MonotonicTime);
     void pause(Seconds);
     void resume();
@@ -51 +51 @@
     const String& name() const { return m_name; }
     const KeyframeValueList& keyframes() const { return m_keyframes; }
-    const FloatSize& boxSize() const { return m_boxSize; }
     const RefPtr<Animation> animation() const { return m_animation; }
-    bool listsMatch() const { return m_listsMatch; }
-    MonotonicTime startTime() const { return m_startTime; }
-    Seconds pauseTime() const { return m_pauseTime; }
     AnimationState state() const { return m_state; }
 
 private:
     void applyInternal(Client&, const AnimationValue& from, const AnimationValue& to, float progress);
-    Seconds computeTotalRunningTime();
+    Seconds computeTotalRunningTime(MonotonicTime);
 
     String m_name;
@@ -85 +81 @@
     void resume();
 
-    void apply(TextureMapperAnimation::Client&);
+    void apply(TextureMapperAnimation::Client&, MonotonicTime);
 
     bool isEmpty() const { return m_animations.isEmpty(); }

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

@@ -662 +662 @@
 }
 
-void TextureMapperLayer::applyAnimationsRecursively()
-{
-    syncAnimations();
+void TextureMapperLayer::applyAnimationsRecursively(MonotonicTime time)
+{
+    syncAnimations(time);
     for (auto* child : m_children)
-        child->applyAnimationsRecursively();
-}
-
-void TextureMapperLayer::syncAnimations()
-{
-    m_animations.apply(*this);
+        child->applyAnimationsRecursively(time);
+}
+
+void TextureMapperLayer::syncAnimations(MonotonicTime time)
+{
+    m_animations.apply(*this, time);
     if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyTransform))
         m_currentTransform.setLocalTransform(m_state.transform);

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

@@ -120 +120 @@
     void setBackingStore(RefPtr<TextureMapperBackingStore>&&);
 
-    void syncAnimations();
+    void syncAnimations(MonotonicTime);
     bool descendantsOrSelfHaveRunningAnimations() const;
 
@@ -127 +127 @@
     void setScrollPositionDeltaIfNeeded(const FloatSize&);
 
-    void applyAnimationsRecursively();
+    void applyAnimationsRecursively(MonotonicTime);
     void addChild(TextureMapperLayer*);
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CoordGraphics] Apply TextureMapperLayer animations with a single MonotonicTime value
+        https://bugs.webkit.org/show_bug.cgi?id=183360
+
+        Reviewed by Sergio Villar Senin.
+
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+        (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+        Pass the monotic time value, as returned by MonotonicTime::now(), to the
+        TextureMapperLayer::applyAnimationsRecursively() call.
+
 2018-03-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp

@@ -104 +104 @@
 
     currentRootLayer->setTextureMapper(m_textureMapper.get());
-    currentRootLayer->applyAnimationsRecursively();
+    currentRootLayer->applyAnimationsRecursively(MonotonicTime::now());
     m_textureMapper->beginPainting(PaintFlags);
     m_textureMapper->beginClip(TransformationMatrix(), clipRect);