Changeset 147121 in webkit

Timestamp:

Mar 28, 2013 9:00:06 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][AC] Animating layer disappears while running with clutter backend
​https://bugs.webkit.org/show_bug.cgi?id=110470

Patch by ChangSeok Oh <ChangSeok Oh> on 2013-03-28
Reviewed by Gustavo Noronha Silva.

The reason of this issue is that clutter_actor_remove_child leads to stopping animations
of child actor. ClutterActor's animation could be defined only when it has a parent actor.
So we should avoid the case calling the api as much as we can. At least we don't
need to reset a actor's parent at all if the current parent is same with new one.
If we can't avoid invoking clutter_actor_remove_child for an animating actor, we may apply
a more complicated way to keep the animation. But I haven't faced such a case yet.

Covered by existing animation tests.

• platform/graphics/clutter/GraphicsLayerActor.cpp:

(graphicsLayerActorSetSublayers):

• platform/graphics/clutter/GraphicsLayerClutter.cpp:

(WebCore::GraphicsLayerClutter::recursiveCommitChanges):
(WebCore::GraphicsLayerClutter::updateSublayerList):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/clutter/GraphicsLayerActor.cpp (modified) (1 diff)
• platform/graphics/clutter/GraphicsLayerClutter.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-28  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][AC] Animating layer disappears while running with clutter backend
+        https://bugs.webkit.org/show_bug.cgi?id=110470
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The reason of this issue is that clutter_actor_remove_child leads to stopping animations
+        of child actor. ClutterActor's animation could be defined only when it has a parent actor.
+        So we should avoid the case calling the api as much as we can. At least we don't
+        need to reset a actor's parent at all if the current parent is same with new one.
+        If we can't avoid invoking clutter_actor_remove_child for an animating actor, we may apply
+        a more complicated way to keep the animation. But I haven't faced such a case yet.
+
+        Covered by existing animation tests.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (graphicsLayerActorSetSublayers):
+        * platform/graphics/clutter/GraphicsLayerClutter.cpp:
+        (WebCore::GraphicsLayerClutter::recursiveCommitChanges):
+        (WebCore::GraphicsLayerClutter::updateSublayerList):
+
 2013-03-28  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp

@@ -471 +471 @@
     }
 
+    ClutterActor* newParentActor = CLUTTER_ACTOR(layer);
     for (size_t i = 0; i < subLayers.size(); ++i) {
-        ClutterActor* layerActor = CLUTTER_ACTOR(subLayers[i].get());
-        clutter_actor_add_child(CLUTTER_ACTOR(layer), layerActor);
+        ClutterActor* childActor = CLUTTER_ACTOR(subLayers[i].get());
+        ClutterActor* oldParentActor = clutter_actor_get_parent(childActor);
+        if (oldParentActor) {
+            if (oldParentActor == newParentActor)
+                continue;
+            clutter_actor_remove_child(oldParentActor, childActor);
+        }
+        clutter_actor_add_child(newParentActor, childActor);
     }
 }

trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp

@@ -579 +579 @@
 
     for (size_t i = 0; i < numChildren; ++i) {
-        GraphicsLayerClutter* curChild = static_cast<GraphicsLayerClutter*>(childLayers[i]);
-        curChild->recursiveCommitChanges(localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
+        GraphicsLayerClutter* currentChild = static_cast<GraphicsLayerClutter*>(childLayers[i]);
+        currentChild->recursiveCommitChanges(localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
     }
 
@@ -659 +659 @@
     const Vector<GraphicsLayer*>& childLayers = children();
 
-    if (childLayers.size() > 0) {
-        size_t numChildren = childLayers.size();
-        for (size_t i = 0; i < numChildren; ++i) {
-            GraphicsLayerClutter* curChild = static_cast<GraphicsLayerClutter*>(childLayers[i]);
-            GraphicsLayerActor* childLayer = curChild->layerForSuperlayer();
-            g_assert(GRAPHICS_LAYER_IS_ACTOR(childLayer));
-            newSublayers.append(childLayer);
-        }
-
-        for (size_t i = 0; i < newSublayers.size(); i++) {
-            ClutterActor* layerActor = CLUTTER_ACTOR(newSublayers[i].get());
-            ClutterActor* parentActor = clutter_actor_get_parent(layerActor);
-            if (parentActor)
-                clutter_actor_remove_child(parentActor, layerActor);
-        }
+    size_t numChildren = childLayers.size();
+    for (size_t i = 0; i < numChildren; ++i) {
+        GraphicsLayerClutter* currentChild = static_cast<GraphicsLayerClutter*>(childLayers[i]);
+        GraphicsLayerActor* childLayer = currentChild->layerForSuperlayer();
+        ASSERT(GRAPHICS_LAYER_IS_ACTOR(childLayer));
+
+        newSublayers.append(childLayer);
     }