Title: [149038] trunk/Source/WebCore
Revision
149038
Author
[email protected]
Date
2013-04-24 08:34:35 -0700 (Wed, 24 Apr 2013)

Log Message

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

Patch by ChangSeok Oh <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149037 => 149038)


--- trunk/Source/WebCore/ChangeLog	2013-04-24 15:30:54 UTC (rev 149037)
+++ trunk/Source/WebCore/ChangeLog	2013-04-24 15:34:35 UTC (rev 149038)
@@ -1,3 +1,18 @@
+2013-04-24  ChangSeok Oh  <[email protected]>
+
+        [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  <[email protected]>
 
         DOMFileSystemBase: fix multiple definitions in the BlackBerry port

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


--- trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp	2013-04-24 15:30:54 UTC (rev 149037)
+++ trunk/Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp	2013-04-24 15:34:35 UTC (rev 149038)
@@ -249,7 +249,7 @@
     ASSERT(priv->layerType != GraphicsLayerClutter::LayerTypeVideoLayer);
 
     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.
         if (!priv->drawsContent && !priv->surface) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to