<!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>[190562] trunk/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/190562">190562</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-10-05 10:18:26 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Replace uses of std::bind() with lambdas
https://bugs.webkit.org/show_bug.cgi?id=149802
Reviewed by Carlos Garcia Campos.
Instead of std::bind(), use C++ lambdas to create std::function<>
wrappers in GStreamer-related class implementations.
Ref-counted classes are protected by capturing a RefPtr object.
GstObject-derived objects are protected by capturing a GRefPtr object.
Necessary specializations for WebKitVideoSink and WebKitWebSrc are added.
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::AudioFileReader::createBus):
* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef):
(WTF::refGPtr<WebKitVideoSink>):
(WTF::derefGPtr<WebKitVideoSink>):
(WTF::refGPtr<WebKitWebSrc>):
(WTF::derefGPtr<WebKitWebSrc>):
* platform/graphics/gstreamer/GRefPtrGStreamer.h:
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
(WebCore::InbandTextTrackPrivateGStreamer::handleSample):
(WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::videoChanged):
(WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
(WebCore::MediaPlayerPrivateGStreamer::audioChanged):
(WebCore::MediaPlayerPrivateGStreamer::textChanged):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
(WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::activeChanged):
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkitVideoSinkRender):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcChangeState):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekDataCb):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ [GStreamer] Replace uses of std::bind() with lambdas
+ https://bugs.webkit.org/show_bug.cgi?id=149802
+
+ Reviewed by Carlos Garcia Campos.
+
+ Instead of std::bind(), use C++ lambdas to create std::function<>
+ wrappers in GStreamer-related class implementations.
+
+ Ref-counted classes are protected by capturing a RefPtr object.
+ GstObject-derived objects are protected by capturing a GRefPtr object.
+ Necessary specializations for WebKitVideoSink and WebKitWebSrc are added.
+
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::AudioFileReader::createBus):
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef):
+ (WTF::refGPtr<WebKitVideoSink>):
+ (WTF::derefGPtr<WebKitVideoSink>):
+ (WTF::refGPtr<WebKitWebSrc>):
+ (WTF::derefGPtr<WebKitWebSrc>):
+ * platform/graphics/gstreamer/GRefPtrGStreamer.h:
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
+ (WebCore::InbandTextTrackPrivateGStreamer::handleSample):
+ (WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::videoChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::audioChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::textChanged):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
+ (WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::activeChanged):
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkitVideoSinkRender):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcChangeState):
+ (webKitWebSrcNeedDataCb):
+ (webKitWebSrcEnoughDataCb):
+ (webKitWebSrcSeekDataCb):
+
</ins><span class="cx"> 2015-10-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused HistoryItem::parent
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> // Start the pipeline processing just after the loop is started.
</span><span class="cx"> GThreadSafeMainLoopSource source;
</span><del>- source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", std::function<void()>(std::bind(&AudioFileReader::decodeAudioForBusCreation, this)), G_PRIORITY_DEFAULT, nullptr, context.get());
</del><ins>+ source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", [this] { decodeAudioForBusCreation(); }, G_PRIORITY_DEFAULT, nullptr, context.get());
</ins><span class="cx">
</span><span class="cx"> g_main_loop_run(m_loop.get());
</span><span class="cx"> g_main_context_pop_thread_default(context.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -258,5 +258,47 @@
</span><span class="cx"> if (ptr)
</span><span class="cx"> gst_toc_unref(ptr);
</span><span class="cx"> }
</span><ins>+
+template <> GRefPtr<WebKitVideoSink> adoptGRef(WebKitVideoSink* ptr)
+{
+ ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
+ return GRefPtr<WebKitVideoSink>(ptr, GRefPtrAdopt);
</ins><span class="cx"> }
</span><ins>+
+template <> WebKitVideoSink* refGPtr<WebKitVideoSink>(WebKitVideoSink* ptr)
+{
+ if (ptr)
+ gst_object_ref_sink(GST_OBJECT(ptr));
+
+ return ptr;
+}
+
+template <> void derefGPtr<WebKitVideoSink>(WebKitVideoSink* ptr)
+{
+ if (ptr)
+ gst_object_unref(GST_OBJECT(ptr));
+}
+
+template <> GRefPtr<WebKitWebSrc> adoptGRef(WebKitWebSrc* ptr)
+{
+ ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
+ return GRefPtr<WebKitWebSrc>(ptr, GRefPtrAdopt);
+}
+
+template <> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr)
+{
+ if (ptr)
+ gst_object_ref_sink(GST_OBJECT(ptr));
+
+ return ptr;
+}
+
+template <> void derefGPtr<WebKitWebSrc>(WebKitWebSrc* ptr)
+{
+ if (ptr)
+ gst_object_unref(GST_OBJECT(ptr));
+}
+
+} // namespace WTF
+
</ins><span class="cx"> #endif // USE(GSTREAMER)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> typedef struct _GstTagList GstTagList;
</span><span class="cx"> typedef struct _GstEvent GstEvent;
</span><span class="cx"> typedef struct _GstToc GstToc;
</span><ins>+typedef struct _WebKitVideoSink WebKitVideoSink;
+typedef struct _WebKitWebSrc WebKitWebSrc;
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -85,7 +87,17 @@
</span><span class="cx"> template<> GRefPtr<GstToc> adoptGRef(GstToc* ptr);
</span><span class="cx"> template<> GstToc* refGPtr<GstToc>(GstToc* ptr);
</span><span class="cx"> template<> void derefGPtr<GstToc>(GstToc* ptr);
</span><del>-}
</del><span class="cx">
</span><ins>+template<> GRefPtr<WebKitVideoSink> adoptGRef(WebKitVideoSink* ptr);
+template<> WebKitVideoSink* refGPtr<WebKitVideoSink>(WebKitVideoSink* ptr);
+template<> void derefGPtr<WebKitVideoSink>(WebKitVideoSink* ptr);
+
+template<> GRefPtr<WebKitWebSrc> adoptGRef(WebKitWebSrc* ptr);
+template<> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);
+template<> void derefGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);
+
+} // namespace WTF
+
</ins><span class="cx"> #endif // USE(GSTREAMER)
</span><del>-#endif
</del><ins>+
+#endif // GRefPtrGStreamer_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -80,12 +80,17 @@
</span><span class="cx"> LockHolder lock(m_sampleMutex);
</span><span class="cx"> m_pendingSamples.append(sample);
</span><span class="cx"> }
</span><del>- m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfSample, this)));
</del><ins>+
+ RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
+ m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample",
+ [protector] { protector->notifyTrackOfSample(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::streamChanged()
</span><span class="cx"> {
</span><del>- m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged, this)));
</del><ins>+ RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
+ m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged",
+ [protector] { protector->notifyTrackOfStreamChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::notifyTrackOfSample()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -650,12 +650,14 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::videoChanged()
</span><span class="cx"> {
</span><del>- m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideo, this)));
</del><ins>+ m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged",
+ [this] { notifyPlayerOfVideo(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::videoCapsChanged()
</span><span class="cx"> {
</span><del>- m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps, this)));
</del><ins>+ m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged",
+ [this] { notifyPlayerOfVideoCaps(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
</span><span class="lines">@@ -703,7 +705,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::audioChanged()
</span><span class="cx"> {
</span><del>- m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfAudio, this)));
</del><ins>+ m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged",
+ [this] { notifyPlayerOfAudio(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
</span><span class="lines">@@ -746,7 +749,8 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void MediaPlayerPrivateGStreamer::textChanged()
</span><span class="cx"> {
</span><del>- m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfText, this)));
</del><ins>+ m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged",
+ [this] { notifyPlayerOfText(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfText()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -361,7 +361,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::volumeChanged()
</span><span class="cx"> {
</span><del>- m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfVolumeChange, this)));
</del><ins>+ m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged",
+ [this] { notifyPlayerOfVolumeChange(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayer::NetworkState MediaPlayerPrivateGStreamerBase::networkState() const
</span><span class="lines">@@ -409,7 +410,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::muteChanged()
</span><span class="cx"> {
</span><del>- m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute, this)));
</del><ins>+ m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged",
+ [this] { notifyPlayerOfMute(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -92,7 +92,8 @@
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::activeChanged()
</span><span class="cx"> {
</span><del>- m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged, this)));
</del><ins>+ m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged",
+ [this] { notifyTrackOfActiveChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::tagsChanged()
</span><span class="lines">@@ -106,7 +107,8 @@
</span><span class="cx"> m_tags.swap(tags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged, this)));
</del><ins>+ m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged",
+ [this] { notifyTrackOfTagsChanged(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -217,9 +217,9 @@
</span><span class="cx"> // This should likely use a lower priority, but glib currently starves
</span><span class="cx"> // lower priority sources.
</span><span class="cx"> // See: https://bugzilla.gnome.org/show_bug.cgi?id=610830.
</span><del>- gst_object_ref(sink);
- priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::function<void()>(std::bind(webkitVideoSinkTimeoutCallback, sink)), G_PRIORITY_DEFAULT,
- [sink] { gst_object_unref(sink); });
</del><ins>+ GRefPtr<WebKitVideoSink> protector(sink);
+ priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback",
+ [protector] { webkitVideoSinkTimeoutCallback(protector.get()); }, G_PRIORITY_DEFAULT);
</ins><span class="cx">
</span><span class="cx"> g_cond_wait(&priv->dataCondition, &priv->sampleMutex);
</span><span class="cx"> return GST_FLOW_OK;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (190561 => 190562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-05 17:05:24 UTC (rev 190561)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-05 17:18:26 UTC (rev 190562)
</span><span class="lines">@@ -661,21 +661,25 @@
</span><span class="cx"> WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</span><span class="cx"> switch (transition) {
</span><span class="cx"> case GST_STATE_CHANGE_READY_TO_PAUSED:
</span><ins>+ {
</ins><span class="cx"> GST_DEBUG_OBJECT(src, "READY->PAUSED");
</span><span class="cx"> priv->pendingStart = TRUE;
</span><del>- gst_object_ref(src);
- priv->startSource.schedule("[WebKit] webKitWebSrcStart", std::function<void()>(std::bind(webKitWebSrcStart, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
</del><ins>+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->startSource.schedule("[WebKit] webKitWebSrcStart",
+ [protector] { webKitWebSrcStart(protector.get()); }, G_PRIORITY_DEFAULT);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case GST_STATE_CHANGE_PAUSED_TO_READY:
</span><ins>+ {
</ins><span class="cx"> GST_DEBUG_OBJECT(src, "PAUSED->READY");
</span><span class="cx"> priv->pendingStart = FALSE;
</span><span class="cx"> // cancel pending sources
</span><span class="cx"> removeTimeoutSources(src);
</span><del>- gst_object_ref(src);
- priv->stopSource.schedule("[WebKit] webKitWebSrcStop", std::function<void()>(std::bind(webKitWebSrcStop, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
</del><ins>+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->stopSource.schedule("[WebKit] webKitWebSrcStop",
+ [protector] { webKitWebSrcStop(protector.get()); }, G_PRIORITY_DEFAULT);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -827,9 +831,9 @@
</span><span class="cx"> if (priv->needDataSource.isScheduled() || !priv->paused)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- gst_object_ref(src);
- priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb", std::function<void()>(std::bind(webKitWebSrcNeedDataMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
</del><ins>+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb",
+ [protector] { webKitWebSrcNeedDataMainCb(protector.get()); }, G_PRIORITY_DEFAULT);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
</span><span class="lines">@@ -859,9 +863,9 @@
</span><span class="cx"> if (priv->enoughDataSource.isScheduled() || priv->paused)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- gst_object_ref(src);
- priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb", std::function<void()>(std::bind(webKitWebSrcEnoughDataMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
</del><ins>+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb",
+ [protector] { webKitWebSrcEnoughDataMainCb(protector.get()); }, G_PRIORITY_DEFAULT);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webKitWebSrcSeekMainCb(WebKitWebSrc* src)
</span><span class="lines">@@ -888,9 +892,9 @@
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Doing range-request seek");
</span><span class="cx"> priv->requestedOffset = offset;
</span><span class="cx">
</span><del>- gst_object_ref(src);
- priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb", std::function<void()>(std::bind(webKitWebSrcSeekMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
</del><ins>+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb",
+ [protector] { webKitWebSrcSeekMainCb(WEBKIT_WEB_SRC(protector.get())); }, G_PRIORITY_DEFAULT);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>