Diff
Modified: trunk/Source/WebCore/ChangeLog (190561 => 190562)
--- 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)
@@ -1,3 +1,48 @@
+2015-10-05 Zan Dobersek <[email protected]>
+
+ [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):
+
2015-10-05 Andreas Kling <[email protected]>
Remove unused HistoryItem::parent
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (190561 => 190562)
--- 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)
@@ -348,7 +348,7 @@
// Start the pipeline processing just after the loop is started.
GThreadSafeMainLoopSource source;
- source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", std::function<void()>(std::bind(&AudioFileReader::decodeAudioForBusCreation, this)), G_PRIORITY_DEFAULT, nullptr, context.get());
+ source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", [this] { decodeAudioForBusCreation(); }, G_PRIORITY_DEFAULT, nullptr, context.get());
g_main_loop_run(m_loop.get());
g_main_context_pop_thread_default(context.get());
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (190561 => 190562)
--- 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)
@@ -258,5 +258,47 @@
if (ptr)
gst_toc_unref(ptr);
}
+
+template <> GRefPtr<WebKitVideoSink> adoptGRef(WebKitVideoSink* ptr)
+{
+ ASSERT(!ptr || !g_object_is_floating(G_OBJECT(ptr)));
+ return GRefPtr<WebKitVideoSink>(ptr, GRefPtrAdopt);
}
+
+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
+
#endif // USE(GSTREAMER)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h (190561 => 190562)
--- 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)
@@ -35,6 +35,8 @@
typedef struct _GstTagList GstTagList;
typedef struct _GstEvent GstEvent;
typedef struct _GstToc GstToc;
+typedef struct _WebKitVideoSink WebKitVideoSink;
+typedef struct _WebKitWebSrc WebKitWebSrc;
namespace WTF {
@@ -85,7 +87,17 @@
template<> GRefPtr<GstToc> adoptGRef(GstToc* ptr);
template<> GstToc* refGPtr<GstToc>(GstToc* ptr);
template<> void derefGPtr<GstToc>(GstToc* ptr);
-}
+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
+
#endif // USE(GSTREAMER)
-#endif
+
+#endif // GRefPtrGStreamer_h
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp (190561 => 190562)
--- 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)
@@ -80,12 +80,17 @@
LockHolder lock(m_sampleMutex);
m_pendingSamples.append(sample);
}
- m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfSample, this)));
+
+ RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
+ m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample",
+ [protector] { protector->notifyTrackOfSample(); });
}
void InbandTextTrackPrivateGStreamer::streamChanged()
{
- m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged, this)));
+ RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
+ m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged",
+ [protector] { protector->notifyTrackOfStreamChanged(); });
}
void InbandTextTrackPrivateGStreamer::notifyTrackOfSample()
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (190561 => 190562)
--- 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)
@@ -650,12 +650,14 @@
void MediaPlayerPrivateGStreamer::videoChanged()
{
- m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideo, this)));
+ m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged",
+ [this] { notifyPlayerOfVideo(); });
}
void MediaPlayerPrivateGStreamer::videoCapsChanged()
{
- m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps, this)));
+ m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged",
+ [this] { notifyPlayerOfVideoCaps(); });
}
void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
@@ -703,7 +705,8 @@
void MediaPlayerPrivateGStreamer::audioChanged()
{
- m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfAudio, this)));
+ m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged",
+ [this] { notifyPlayerOfAudio(); });
}
void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
@@ -746,7 +749,8 @@
#if ENABLE(VIDEO_TRACK)
void MediaPlayerPrivateGStreamer::textChanged()
{
- m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfText, this)));
+ m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged",
+ [this] { notifyPlayerOfText(); });
}
void MediaPlayerPrivateGStreamer::notifyPlayerOfText()
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (190561 => 190562)
--- 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)
@@ -361,7 +361,8 @@
void MediaPlayerPrivateGStreamerBase::volumeChanged()
{
- m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfVolumeChange, this)));
+ m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged",
+ [this] { notifyPlayerOfVolumeChange(); });
}
MediaPlayer::NetworkState MediaPlayerPrivateGStreamerBase::networkState() const
@@ -409,7 +410,8 @@
void MediaPlayerPrivateGStreamerBase::muteChanged()
{
- m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute, this)));
+ m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged",
+ [this] { notifyPlayerOfMute(); });
}
#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (190561 => 190562)
--- 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)
@@ -92,7 +92,8 @@
void TrackPrivateBaseGStreamer::activeChanged()
{
- m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged, this)));
+ m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged",
+ [this] { notifyTrackOfActiveChanged(); });
}
void TrackPrivateBaseGStreamer::tagsChanged()
@@ -106,7 +107,8 @@
m_tags.swap(tags);
}
- m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged, this)));
+ m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged",
+ [this] { notifyTrackOfTagsChanged(); });
}
void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged()
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (190561 => 190562)
--- 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)
@@ -217,9 +217,9 @@
// This should likely use a lower priority, but glib currently starves
// lower priority sources.
// See: https://bugzilla.gnome.org/show_bug.cgi?id=610830.
- gst_object_ref(sink);
- priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::function<void()>(std::bind(webkitVideoSinkTimeoutCallback, sink)), G_PRIORITY_DEFAULT,
- [sink] { gst_object_unref(sink); });
+ GRefPtr<WebKitVideoSink> protector(sink);
+ priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback",
+ [protector] { webkitVideoSinkTimeoutCallback(protector.get()); }, G_PRIORITY_DEFAULT);
g_cond_wait(&priv->dataCondition, &priv->sampleMutex);
return GST_FLOW_OK;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (190561 => 190562)
--- 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)
@@ -661,21 +661,25 @@
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
+ {
GST_DEBUG_OBJECT(src, "READY->PAUSED");
priv->pendingStart = TRUE;
- gst_object_ref(src);
- priv->startSource.schedule("[WebKit] webKitWebSrcStart", std::function<void()>(std::bind(webKitWebSrcStart, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->startSource.schedule("[WebKit] webKitWebSrcStart",
+ [protector] { webKitWebSrcStart(protector.get()); }, G_PRIORITY_DEFAULT);
break;
+ }
case GST_STATE_CHANGE_PAUSED_TO_READY:
+ {
GST_DEBUG_OBJECT(src, "PAUSED->READY");
priv->pendingStart = FALSE;
// cancel pending sources
removeTimeoutSources(src);
- gst_object_ref(src);
- priv->stopSource.schedule("[WebKit] webKitWebSrcStop", std::function<void()>(std::bind(webKitWebSrcStop, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->stopSource.schedule("[WebKit] webKitWebSrcStop",
+ [protector] { webKitWebSrcStop(protector.get()); }, G_PRIORITY_DEFAULT);
break;
+ }
default:
break;
}
@@ -827,9 +831,9 @@
if (priv->needDataSource.isScheduled() || !priv->paused)
return;
- gst_object_ref(src);
- priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb", std::function<void()>(std::bind(webKitWebSrcNeedDataMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb",
+ [protector] { webKitWebSrcNeedDataMainCb(protector.get()); }, G_PRIORITY_DEFAULT);
}
static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
@@ -859,9 +863,9 @@
if (priv->enoughDataSource.isScheduled() || priv->paused)
return;
- gst_object_ref(src);
- priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb", std::function<void()>(std::bind(webKitWebSrcEnoughDataMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb",
+ [protector] { webKitWebSrcEnoughDataMainCb(protector.get()); }, G_PRIORITY_DEFAULT);
}
static void webKitWebSrcSeekMainCb(WebKitWebSrc* src)
@@ -888,9 +892,9 @@
GST_DEBUG_OBJECT(src, "Doing range-request seek");
priv->requestedOffset = offset;
- gst_object_ref(src);
- priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb", std::function<void()>(std::bind(webKitWebSrcSeekMainCb, src)), G_PRIORITY_DEFAULT,
- [src] { gst_object_unref(src); });
+ GRefPtr<WebKitWebSrc> protector(src);
+ priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb",
+ [protector] { webKitWebSrcSeekMainCb(WEBKIT_WEB_SRC(protector.get())); }, G_PRIORITY_DEFAULT);
return TRUE;
}
