Changeset 148202 in webkit

Timestamp:

Apr 11, 2013 7:42:14 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][AC] use a smart pointer for GList and ClutterCanvas
​https://bugs.webkit.org/show_bug.cgi?id=114057

Patch by ChangSeok Oh <ChangSeok Oh> on 2013-04-11
Reviewed by Gustavo Noronha Silva.

We can make simple code & prevent possible memory leak by using a proper smart pointer.
Especially if we get children by clutter_actor_get_children, we should free it after using.

No functionality changed.

• platform/graphics/clutter/GraphicsLayerActor.cpp:

(graphicsLayerActorUpdateTexture):
(graphicsLayerActorRemoveAll):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][AC] use a smart pointer for GList and ClutterCanvas
+        https://bugs.webkit.org/show_bug.cgi?id=114057
+
+        Reviewed by Gustavo Noronha Silva.
+
+        We can make simple code & prevent possible memory leak by using a proper smart pointer.
+        Especially if we get children by clutter_actor_get_children, we should free it after using.
+
+        No functionality changed.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (graphicsLayerActorUpdateTexture):
+        (graphicsLayerActorRemoveAll):
+
 2013-04-11  Arvid Nilsson  <anilsson@rim.com>
 

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

@@ -30 +30 @@
 #include "RefPtrCairo.h"
 #include "TransformationMatrix.h"
+#include <algorithm>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/text/CString.h>
 
@@ -267 +269 @@
 
     ClutterActor* actor = CLUTTER_ACTOR(layer);
-    ClutterContent* canvas = clutter_actor_get_content(actor);
+    GRefPtr<ClutterContent> canvas = adoptGRef(clutter_actor_get_content(actor));
     if (canvas) {
         // Nothing needs a texture, remove the one we have, if any.
         if (!priv->drawsContent && !priv->surface) {
-            g_signal_handlers_disconnect_by_func(canvas, reinterpret_cast<void*>(graphicsLayerActorDraw), layer);
+            g_signal_handlers_disconnect_by_func(canvas.get(), reinterpret_cast<void*>(graphicsLayerActorDraw), layer);
             clutter_actor_set_content(actor, 0);
         }
@@ -278 +280 @@
 
     // We should have a texture, so create one.
-    int width = ceilf(clutter_actor_get_width(actor));
-    int height = ceilf(clutter_actor_get_height(actor));
-
-    canvas = clutter_canvas_new();
-    clutter_actor_set_content(actor, canvas);
-    clutter_canvas_set_size(CLUTTER_CANVAS(canvas), width > 0 ? width : 1, height > 0 ? height : 1);
-    g_object_unref(canvas);
-    
-    g_signal_connect(canvas, "draw", G_CALLBACK(graphicsLayerActorDraw), layer);
+    canvas = adoptGRef(clutter_canvas_new());
+    clutter_actor_set_content(actor, canvas.get());
+
+    int width = std::max(static_cast<int>(ceilf(clutter_actor_get_width(actor))), 1);
+    int height = std::max(static_cast<int>(ceilf(clutter_actor_get_height(actor))), 1);
+    clutter_canvas_set_size(CLUTTER_CANVAS(canvas.get()), width, height);
+
+    g_signal_connect(canvas.get(), "draw", G_CALLBACK(graphicsLayerActorDraw), layer);
 }
 
@@ -340 +341 @@
     g_return_if_fail(GRAPHICS_LAYER_IS_ACTOR(layer));
 
-    GList* children = clutter_actor_get_children(CLUTTER_ACTOR(layer));
-    for (; children; children = children->next)
-        clutter_actor_remove_child(CLUTTER_ACTOR(layer), CLUTTER_ACTOR(children->data));
+    GOwnPtr<GList> children(clutter_actor_get_children(CLUTTER_ACTOR(layer)));
+    for (GList* child = children.get(); child; child = child->next)
+        clutter_actor_remove_child(CLUTTER_ACTOR(layer), CLUTTER_ACTOR(child->data));
 }