Changeset 79546 in webkit

Timestamp:

Feb 24, 2011 4:47:40 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-02-21 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GStreamer] GRefPtr support for GstElement
​https://bugs.webkit.org/show_bug.cgi?id=54870

• CMakeListsEfl.txt:
• GNUmakefile.am:
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp: Added. (WTF::GstElement):
• platform/graphics/gstreamer/GRefPtrGStreamer.h: Added.
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: (webKitWebSrcQuery):

Location:

trunk/Source/WebCore

Files:

• CMakeListsEfl.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp (added)
• platform/graphics/gstreamer/GRefPtrGStreamer.h (added)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (5 diffs)

trunk/Source/WebCore/CMakeListsEfl.txt

@@ -174 +174 @@
   LIST(APPEND WebCore_SOURCES
     platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
+    platform/graphics/gstreamer/GRefPtrGStreamer.cpp
     platform/graphics/gstreamer/GStreamerGWorld.cpp
     platform/graphics/gstreamer/ImageGStreamerCairo.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-21  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] GRefPtr support for GstElement
+        https://bugs.webkit.org/show_bug.cgi?id=54870
+
+        * CMakeListsEfl.txt:
+        * GNUmakefile.am:
+        * platform/graphics/gstreamer/GRefPtrGStreamer.cpp: Added.
+        (WTF::GstElement):
+        * platform/graphics/gstreamer/GRefPtrGStreamer.h: Added.
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcQuery):
+
 2011-02-24  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.am

@@ -3708 +3708 @@
         Source/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp \
         Source/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h \
+        Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp \
+        Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h \
         Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp \
         Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h \

trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -24 +24 @@
 #include "GOwnPtr.h"
 #include "GRefPtr.h"
+#include "GRefPtrGStreamer.h"
 #include "NetworkingContext.h"
 #include "Noncopyable.h"
@@ -501 +502 @@
 static gboolean webKitWebSrcQuery(GstPad* pad, GstQuery* query)
 {
-    WebKitWebSrc* src = WEBKIT_WEB_SRC(gst_pad_get_parent(pad));
+    GRefPtr<GstElement> src = adoptGRef(gst_pad_get_parent_element(pad));
+    WebKitWebSrc* webkitSrc = WEBKIT_WEB_SRC(src.get());
     gboolean result = FALSE;
 
@@ -511 +513 @@
         gst_query_parse_duration(query, &format, NULL);
 
-        GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
-        if ((format == GST_FORMAT_BYTES) && (src->priv->size > 0)) {
-            gst_query_set_duration(query, format, src->priv->size);
+        GST_DEBUG_OBJECT(webkitSrc, "duration query in format %s", gst_format_get_name(format));
+        if ((format == GST_FORMAT_BYTES) && (webkitSrc->priv->size > 0)) {
+            gst_query_set_duration(query, format, webkitSrc->priv->size);
             result = TRUE;
         }
@@ -520 +522 @@
     case GST_QUERY_URI:
     {
-        gst_query_set_uri(query, src->priv->uri);
+        gst_query_set_uri(query, webkitSrc->priv->uri);
         result = TRUE;
         break;
@@ -531 +533 @@
         result = gst_pad_query_default(pad, query);
 
-    gst_object_unref(src);
     return result;
 }