Changeset 168175 in webkit

Timestamp:

May 2, 2014 10:29:22 AM (10 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Animations on vox.com look wrong
​https://bugs.webkit.org/show_bug.cgi?id=132462
<rdar://problem/16731884>

Reviewed by Sam Weinig.

PlatformCALayerRemote was managing animations incorrectly; aninations
would stick around in m_properties.addedAnimations and get added a second
time by mistake.

Animations have to be managed a little differently to other properties,
since they are not steady-state things. A given commit has to send over
the added and removed animations, and then clear the layer properties.

Do this by adding PlatformCALayerRemote::didCommit(), which is called
after the layer properties have been encoded, and have it clear the lists
of added and removed animations.

removeAnimationForKey() also has to remove the animation from addedAnimations
so that an add/remove in the same commit doesn't send the animation to the
UI process.

• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
(WebKit::PlatformCALayerRemote::didCommit):
(WebKit::PlatformCALayerRemote::removeAnimationForKey):

• WebProcess/WebPage/mac/PlatformCALayerRemote.h:
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::flushLayers):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (3 diffs)
• WebProcess/WebPage/mac/PlatformCALayerRemote.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-01  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Animations on vox.com look wrong
+        https://bugs.webkit.org/show_bug.cgi?id=132462
+        <rdar://problem/16731884>
+
+        Reviewed by Sam Weinig.
+        
+        PlatformCALayerRemote was managing animations incorrectly; aninations
+        would stick around in m_properties.addedAnimations and get added a second
+        time by mistake.
+        
+        Animations have to be managed a little differently to other properties,
+        since they are not steady-state things. A given commit has to send over
+        the added and removed animations, and then clear the layer properties.
+        
+        Do this by adding PlatformCALayerRemote::didCommit(), which is called
+        after the layer properties have been encoded, and have it clear the lists
+        of added and removed animations.
+        
+        removeAnimationForKey() also has to remove the animation from addedAnimations
+        so that an add/remove in the same commit doesn't send the animation to the
+        UI process.
+
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+        (WebKit::PlatformCALayerRemote::recursiveBuildTransaction):
+        (WebKit::PlatformCALayerRemote::didCommit):
+        (WebKit::PlatformCALayerRemote::removeAnimationForKey):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+
 2014-05-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -136 +136 @@
         if (m_layerType == LayerTypeCustom) {
             RemoteLayerTreePropertyApplier::applyProperties(platformLayer(), nullptr, m_properties, RemoteLayerTreePropertyApplier::RelatedLayerMap());
-            m_properties.resetChangedProperties();
+            didCommit();
             return;
         }
@@ -151 +151 @@
     if (m_maskLayer)
         m_maskLayer->recursiveBuildTransaction(transaction);
+}
+
+void PlatformCALayerRemote::didCommit()
+{
+    m_properties.addedAnimations.clear();
+    m_properties.keyPathsOfAnimationsToRemove.clear();
+    m_properties.resetChangedProperties();
 }
 
@@ -298 +305 @@
 void PlatformCALayerRemote::removeAnimationForKey(const String& key)
 {
-    // FIXME: remove from m_properties.addedAnimations ?
+    m_properties.addedAnimations.remove(key);
     m_properties.keyPathsOfAnimationsToRemove.add(key);
     m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnimationsChanged);

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

@@ -158 +158 @@
     RemoteLayerTreeTransaction::LayerProperties& properties() { return m_properties; }
 
+    void didCommit();
+
     void clearContext() { m_context = nullptr; }
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

@@ -279 +279 @@
         if (layer->properties().changedProperties & RemoteLayerTreeTransaction::LayerChanges::BackingStoreChanged)
             hadAnyChangedBackingStore = true;
-        layer->properties().resetChangedProperties();
+        layer->didCommit();
     }