Changeset 149038 in webkit

Timestamp:

Apr 24, 2013 8:34:35 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][AC] Fix unexpected clear of ClutterContent.
​https://bugs.webkit.org/show_bug.cgi?id=115099

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

adoptGRef doesn't increase a reference count. So if a actor has a valid ClutterContent,
it would be cleared unexpectedly by smart pointer when escaping a function.

No new tests, no functionality changed.

• platform/graphics/clutter/GraphicsLayerActor.cpp:

(graphicsLayerActorUpdateTexture):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-24  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK][AC] Fix unexpected clear of ClutterContent.
+        https://bugs.webkit.org/show_bug.cgi?id=115099
+
+        Reviewed by Gustavo Noronha Silva.
+
+        adoptGRef doesn't increase a reference count. So if a actor has a valid ClutterContent,
+        it would be cleared unexpectedly by smart pointer when escaping a function.
+
+        No new tests, no functionality changed.
+
+        * platform/graphics/clutter/GraphicsLayerActor.cpp:
+        (graphicsLayerActorUpdateTexture):
+
 2013-04-24  Alberto Garcia  <agarcia@igalia.com>
 

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

@@ -250 +250 @@
 
     ClutterActor* actor = CLUTTER_ACTOR(layer);
-    GRefPtr<ClutterContent> canvas = adoptGRef(clutter_actor_get_content(actor));
+    GRefPtr<ClutterContent> canvas = clutter_actor_get_content(actor);
     if (canvas) {
         // Nothing needs a texture, remove the one we have, if any.