Changeset 147145 in webkit

Timestamp:

Mar 28, 2013 12:59:07 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][AC] Use transform property of ClutterActor
​https://bugs.webkit.org/show_bug.cgi?id=113317

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

ClutterActor has a transform property to set transformation matrix directly
since version 1.12. So we don't need to keep and use the matrix property of GraphicsLayerActor.

No new tests because of no functionality change.

• platform/graphics/clutter/GraphicsLayerActor.cpp:

(_GraphicsLayerActorPrivate):
(graphicsLayerActorDispose):
(graphicsLayerActorApplyTransform):

• platform/graphics/clutter/GraphicsLayerActor.h:
• platform/graphics/clutter/GraphicsLayerClutter.cpp:

(WebCore::GraphicsLayerClutter::updateTransform):

• platform/graphics/clutter/PlatformClutterAnimation.cpp:

(WebCore::PlatformClutterAnimation::addTransformTransition):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-28  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][AC] Use transform property of ClutterActor
+        https://bugs.webkit.org/show_bug.cgi?id=113317
+
+        Reviewed by Gustavo Noronha Silva.
+
+        ClutterActor has a transform property to set transformation matrix directly
+        since version 1.12. So we don't need to keep and use the matrix property of GraphicsLayerActor.
+
+        No new tests because of no functionality change.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (_GraphicsLayerActorPrivate):
+        (graphicsLayerActorDispose):
+        (graphicsLayerActorApplyTransform):
+        * platform/graphics/clutter/GraphicsLayerActor.h:
+        * platform/graphics/clutter/GraphicsLayerClutter.cpp:
+        (WebCore::GraphicsLayerClutter::updateTransform):
+        * platform/graphics/clutter/PlatformClutterAnimation.cpp:
+        (WebCore::PlatformClutterAnimation::addTransformTransition):
+
 2013-03-28  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -42 +42 @@
 
     RefPtr<cairo_surface_t> surface;
-    CoglMatrix* matrix;
 
     PlatformClutterLayerClient* layerClient;
@@ -151 +150 @@
     priv->surface.clear();
 
-    if (priv->matrix)
-        cogl_matrix_free(priv->matrix);
-
     G_OBJECT_CLASS(graphics_layer_actor_parent_class)->dispose(object);
 }
@@ -208 +204 @@
 
     CLUTTER_ACTOR_CLASS(graphics_layer_actor_parent_class)->apply_transform(actor, matrix);
-
-    if (priv->matrix) {
-        float width = 0, height = 0;
-        clutter_actor_get_size(actor, &width, &height);
-        if (width <= 1.0 || height <= 1.0)
-            return;
-
-        // The pivot of actor is a normalized value, so we need an actual anchor position
-        // in actor's local coordinate system for translating.
-        float anchorX = 0, anchorY = 0, anchorZ = 0;
-        graphicsLayerActorGetAnchorPoint(GRAPHICS_LAYER_ACTOR(actor), &anchorX, &anchorY, &anchorZ);
-        anchorX *= width;
-        anchorY *= height;
-
-        // CSS3 tranform-style can be changed on the fly, 
-        // so we have to copy priv->matrix in order to recover z-axis. 
-        CoglMatrix* localMatrix = cogl_matrix_copy(priv->matrix);
-
-        cogl_matrix_translate(matrix, anchorX, anchorY, anchorZ);
-        cogl_matrix_multiply(matrix, matrix, localMatrix);
-        cogl_matrix_translate(matrix, -anchorX, -anchorY, -anchorZ);
-        cogl_matrix_free(localMatrix);
-    }
 }
 
@@ -381 +354 @@
     // FIXME: Need to invalidate a specific area?
     clutter_content_invalidate(canvas);
-}
-
-void graphicsLayerActorSetTransform(GraphicsLayerActor* layer, const CoglMatrix* matrix) 
-{
-    bool needToRedraw = false;
-
-    GraphicsLayerActorPrivate* priv = layer->priv;
-    if (priv->matrix) {
-        cogl_matrix_free(priv->matrix);
-        needToRedraw = true;
-    }
-
-    if (matrix && !cogl_matrix_is_identity(matrix)) {
-        priv->matrix = cogl_matrix_copy(matrix);
-        needToRedraw = true;
-    } else
-        priv->matrix = 0;
-
-    if (needToRedraw)
-        clutter_actor_queue_redraw(CLUTTER_ACTOR(layer));
 }
 

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

@@ -82 +82 @@
 void graphicsLayerActorSetSurface(GraphicsLayerActor*, cairo_surface_t*);
 void graphicsLayerActorInvalidateRectangle(GraphicsLayerActor*, const WebCore::FloatRect&);
-void graphicsLayerActorSetTransform(GraphicsLayerActor*, const CoglMatrix*);
 void graphicsLayerActorSetAnchorPoint(GraphicsLayerActor*, float, float, float);
 void graphicsLayerActorGetAnchorPoint(GraphicsLayerActor*, float*, float*, float*);

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

@@ -679 +679 @@
 {
     CoglMatrix matrix = m_transform;
-    graphicsLayerActorSetTransform(primaryLayer(), &matrix);
+    clutter_actor_set_transform(CLUTTER_ACTOR(primaryLayer()), &matrix);
 }
 

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

@@ -612 +612 @@
     }
 
-    // If clutter covers valueFunction type animations, we should release keeping transform matrix.
-    // Otherwise, the transformation is applied twice unexpectedly. See graphicsLayerActorApplyTransform.
-    graphicsLayerActorSetTransform(GRAPHICS_LAYER_ACTOR(m_layer.get()), 0);
+    // FIXME: Work-around the fact that if there is a transform already set the animation fails to start.
+    // https://bugzilla.gnome.org/show_bug.cgi?id=696804
+    clutter_actor_set_transform(m_layer.get(), 0);
 }