[GTK][AC] Clutter required version up to 1.12

https://bugs.webkit.org/show_bug.cgi?id=109037

Patch by ChangSeok Oh <shivamidow@gmail.com> 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ca19141a31da666dc624cdaed57a1faaee2c0f69..059a39cd1c7e4ffb928f156a2f696b2ec364d6fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-07  ChangSeok Oh  <shivamidow@gmail.com>
+
+        [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  <zdobersek@igalia.com>
 
         [Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 94f29488ea08b14e186591dae4317f50ccdf988c..bb386ac7e74349227aaad7fd17d9fb8d69e51f0a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-02-07  ChangSeok Oh  <shivamidow@gmail.com>
+
+        [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  <bpoulain@apple.com>
 
         Move pauseAnimation/pauseTransition from TestRunner to Internals

diff --git a/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp b/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp
index d3d8ee69fdb8bb2ede7cebf28b0c2d2f9224d5f6..952eca3c97859c513a0a6e48f80000bedbc9dd1a 100644 (file)
--- a/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp
+++ b/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp
@@ -427,10 +427,8 @@ void graphicsLayerActorSetAnchorPoint(GraphicsLayerActor* layer, float x, float
     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)

diff --git a/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp b/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp
index 357dfe4b3f5adb5b742e53912d0dff715d87c870..3c9a0c28362a54db97d8088884005386ab9732d1 100644 (file)
--- a/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp
+++ b/Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp
@@ -124,7 +124,7 @@ static gboolean idleDestroy(gpointer data)
         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 @@ void GraphicsLayerClutter::updateSublayerList()
             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);
         }
     }
 

diff --git a/configure.ac b/configure.ac
index 624ba5732e66204d9be8b45b173d8eaacca67220..14fb4b80a248e1d78d77d2937eb600e2ec6c6416 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,7 @@ PANGO_REQUIRED_VERSION=1.21.0
 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