<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196933] releases/WebKitGTK/webkit-2.10/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196933">196933</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-22 03:49:09 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196809">r196809</a> - [GStreamer] clean-up various leaks
https://bugs.webkit.org/show_bug.cgi?id=154285
Reviewed by Carlos Garcia Campos.
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
(webkit_web_audio_src_init): Take full ownership of the GstTask.
* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef): Null pointer support in ASSERTs.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::initializeGStreamerAndRegisterWebKitElements): Take full ownership of the GstElementFactory pointers.
(WebCore::MediaPlayerPrivateGStreamer::isAvailable): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (196932 => 196933)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 11:44:40 UTC (rev 196932)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 11:49:09 UTC (rev 196933)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-19 Philippe Normand <pnormand@igalia.com>
+
+ [GStreamer] clean-up various leaks
+ https://bugs.webkit.org/show_bug.cgi?id=154285
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ (webkit_web_audio_src_init): Take full ownership of the GstTask.
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef): Null pointer support in ASSERTs.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::initializeGStreamerAndRegisterWebKitElements): Take full ownership of the GstElementFactory pointers.
+ (WebCore::MediaPlayerPrivateGStreamer::isAvailable): Ditto.
+
</ins><span class="cx"> 2016-02-18 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Limit the number of tiles according to the visible area
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (196932 => 196933)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2016-02-22 11:44:40 UTC (rev 196932)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2016-02-22 11:49:09 UTC (rev 196933)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> priv->bus = 0;
</span><span class="cx">
</span><span class="cx"> g_rec_mutex_init(&priv->mutex);
</span><del>- priv->task = gst_task_new(reinterpret_cast<GstTaskFunction>(webKitWebAudioSrcLoop), src, 0);
</del><ins>+ priv->task = adoptGRef(gst_task_new(reinterpret_cast<GstTaskFunction>(webKitWebAudioSrcLoop), src, 0));
</ins><span class="cx">
</span><span class="cx"> gst_task_set_lock(priv->task.get(), &priv->mutex);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (196932 => 196933)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2016-02-22 11:44:40 UTC (rev 196932)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2016-02-22 11:49:09 UTC (rev 196933)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ ASSERT(!ptr || !g_object_is_floating(ptr));
</ins><span class="cx"> return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ ASSERT(!ptr || !g_object_is_floating(ptr));
</ins><span class="cx"> return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ ASSERT(!ptr || !g_object_is_floating(ptr));
</ins><span class="cx"> return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,10 +103,10 @@
</span><span class="cx"> gst_caps_unref(ptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ // There is no need to check the object reference is floating here because
+ // gst_task_init() always sinks it.
</ins><span class="cx"> return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ ASSERT(!ptr || !g_object_is_floating(ptr));
</ins><span class="cx"> return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
</span><span class="cx"> {
</span><del>- ASSERT(!g_object_is_floating(G_OBJECT(ptr)));
</del><ins>+ ASSERT(!ptr || !g_object_is_floating(ptr));
</ins><span class="cx"> return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (196932 => 196933)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-02-22 11:44:40 UTC (rev 196932)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-02-22 11:49:09 UTC (rev 196933)
</span><span class="lines">@@ -149,14 +149,14 @@
</span><span class="cx"> if (!initializeGStreamer())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GRefPtr<GstElementFactory> srcFactory = gst_element_factory_find("webkitwebsrc");
</del><ins>+ GRefPtr<GstElementFactory> srcFactory = adoptGRef(gst_element_factory_find("webkitwebsrc"));
</ins><span class="cx"> if (!srcFactory) {
</span><span class="cx"> GST_DEBUG_CATEGORY_INIT(webkit_media_player_debug, "webkitmediaplayer", 0, "WebKit media player");
</span><span class="cx"> gst_element_register(0, "webkitwebsrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEB_SRC);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><del>- GRefPtr<GstElementFactory> WebKitMediaSrcFactory = gst_element_factory_find("webkitmediasrc");
</del><ins>+ GRefPtr<GstElementFactory> WebKitMediaSrcFactory = adoptGRef(gst_element_factory_find("webkitmediasrc"));
</ins><span class="cx"> if (!WebKitMediaSrcFactory)
</span><span class="cx"> gst_element_register(0, "webkitmediasrc", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_MEDIA_SRC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if (!initializeGStreamerAndRegisterWebKitElements())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GRefPtr<GstElementFactory> factory = gst_element_factory_find("playbin");
</del><ins>+ GRefPtr<GstElementFactory> factory = adoptGRef(gst_element_factory_find("playbin"));
</ins><span class="cx"> return factory;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>