Title: [142172] trunk
Revision
142172
Author
[email protected]
Date
2013-02-07 13:37:09 -0800 (Thu, 07 Feb 2013)

Log Message

[GTK][AC] Clutter required version up to 1.12
https://bugs.webkit.org/show_bug.cgi?id=109037

Patch by ChangSeok Oh <[email protected]> on 2013-02-07
Reviewed by Martin Robinson.

.:

The clutter requried version is changed to 1.12.

* configure.ac:

Source/WebCore:

Replace deprecated clutter apis with new ones.

No new tests, since this patch is minor refactoring.

* platform/graphics/clutter/GraphicsLayerActor.cpp:
(graphicsLayerActorSetAnchorPoint):
* platform/graphics/clutter/GraphicsLayerClutter.cpp:
(WebCore::idleDestroy):
(WebCore::GraphicsLayerClutter::updateSublayerList):

Modified Paths

Diff

Modified: trunk/ChangeLog (142171 => 142172)


--- trunk/ChangeLog	2013-02-07 21:34:32 UTC (rev 142171)
+++ trunk/ChangeLog	2013-02-07 21:37:09 UTC (rev 142172)
@@ -1,3 +1,14 @@
+2013-02-07  ChangSeok Oh  <[email protected]>
+
+        [GTK][AC] Clutter required version up to 1.12
+        https://bugs.webkit.org/show_bug.cgi?id=109037
+
+        Reviewed by Martin Robinson.
+
+        The clutter requried version is changed to 1.12.
+
+        * configure.ac:
+
 2013-02-07  Zan Dobersek  <[email protected]>
 
         [Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional

Modified: trunk/Source/WebCore/ChangeLog (142171 => 142172)


--- trunk/Source/WebCore/ChangeLog	2013-02-07 21:34:32 UTC (rev 142171)
+++ trunk/Source/WebCore/ChangeLog	2013-02-07 21:37:09 UTC (rev 142172)
@@ -1,3 +1,20 @@
+2013-02-07  ChangSeok Oh  <[email protected]>
+
+        [GTK][AC] Clutter required version up to 1.12
+        https://bugs.webkit.org/show_bug.cgi?id=109037
+
+        Reviewed by Martin Robinson.
+
+        Replace deprecated clutter apis with new ones.
+
+        No new tests, since this patch is minor refactoring.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (graphicsLayerActorSetAnchorPoint):
+        * platform/graphics/clutter/GraphicsLayerClutter.cpp:
+        (WebCore::idleDestroy):
+        (WebCore::GraphicsLayerClutter::updateSublayerList):
+
 2013-02-07  Benjamin Poulain  <[email protected]>
 
         Move pauseAnimation/pauseTransition from TestRunner to Internals

Modified: trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp (142171 => 142172)


--- trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp	2013-02-07 21:34:32 UTC (rev 142171)
+++ trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp	2013-02-07 21:37:09 UTC (rev 142172)
@@ -427,10 +427,8 @@
     priv->anchorZ = z;
 
     ClutterActor* actor = CLUTTER_ACTOR(layer);
-
-    float width, height;
-    clutter_actor_get_size(actor, &width, &height);
-    clutter_actor_set_anchor_point(actor, width * priv->anchorX, height * priv->anchorY);
+    clutter_actor_set_pivot_point(actor, x, y);
+    clutter_actor_set_pivot_point_z(actor, z);
 }
 
 void graphicsLayerActorGetAnchorPoint(GraphicsLayerActor* layer, float* x, float* y, float* z)

Modified: trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp (142171 => 142172)


--- trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp	2013-02-07 21:34:32 UTC (rev 142171)
+++ trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp	2013-02-07 21:37:09 UTC (rev 142172)
@@ -124,7 +124,7 @@
         graphicsLayerActorRemoveAll(GRAPHICS_LAYER_ACTOR(actor.get()));
 
     if (parent)
-        clutter_container_remove_actor(CLUTTER_CONTAINER(parent), actor.get());
+        clutter_actor_remove_child(parent, actor.get());
 
     // FIXME: we should assert that the actor's ref count is 1 here, but some
     // of them are getting here with 2!
@@ -531,7 +531,7 @@
             ClutterActor* layerActor = CLUTTER_ACTOR(newSublayers[i].get());
             ClutterActor* parentActor = clutter_actor_get_parent(layerActor);
             if (parentActor)
-                clutter_container_remove_actor(CLUTTER_CONTAINER(parentActor), layerActor);
+                clutter_actor_remove_child(parentActor, layerActor);
         }
     }
 

Modified: trunk/configure.ac (142171 => 142172)


--- trunk/configure.ac	2013-02-07 21:34:32 UTC (rev 142171)
+++ trunk/configure.ac	2013-02-07 21:37:09 UTC (rev 142172)
@@ -343,7 +343,7 @@
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 ENCHANT_REQUIRED_VERSION=0.22
-CLUTTER_REQUIRED_VERSION=1.8.2
+CLUTTER_REQUIRED_VERSION=1.12
 CLUTTER_GTK_REQUIRED_VERSION=1.0.2
 ATSPI2_REQUIRED_VERSION=2.2.1
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to