Skip to content

Commit

Permalink
Merge r179866 - [GTK] GMutexLocker build issue
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=141381

Reviewed by Žan Doberšek.

Source/WebCore:

Use always WTF::GMutexLocker because newer glib versions have a
GMutexLocker in the public API.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
(WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkitVideoSinkTimeoutCallback):
(webkitVideoSinkRender):
(unlockSampleMutex):
(webkitVideoSinkUnlockStop):
(webkitVideoSinkStart):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcGetProperty):
(webKitWebSrcStop):
(webKitWebSrcStart):
(webKitWebSrcChangeState):
(webKitWebSrcQueryWithParent):
(webKitWebSrcGetUri):
(webKitWebSrcSetUri):
(webKitWebSrcNeedDataMainCb):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataMainCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekDataCb):
(webKitWebSrcSetMediaPlayer):
(StreamingClient::createReadBuffer):
(StreamingClient::handleResponseReceived):
(StreamingClient::handleDataReceived):
(StreamingClient::handleNotifyFinished):
(ResourceHandleStreamingClient::wasBlocked):
(ResourceHandleStreamingClient::cannotShowURL):

Source/WTF:

Remove using WTF::GMutexLocker from the header, since newer glib
versions have a GMutexLocker in the public API.

* wtf/gobject/GMutexLocker.h:

Canonical link: https://commits.webkit.org/154760.298@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@182382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
@carlosgcampos
carlosgcampos committed Apr 6, 2015
1 parent 46386bf commit 0c215f7
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 31 deletions.
12 changes: 12 additions & 0 deletions Source/WTF/ChangeLog
View file
@@ -1,3 +1,15 @@
2015-02-10 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] GMutexLocker build issue
https://bugs.webkit.org/show_bug.cgi?id=141381

Reviewed by Žan Doberšek.

Remove using WTF::GMutexLocker from the header, since newer glib
versions have a GMutexLocker in the public API.

* wtf/gobject/GMutexLocker.h:

2014-12-09 Alberto Garcia <berto@igalia.com>

Undefined Symbol build error "_objc_registerThreadWithCollector" when building WebKit GTK Mac OS X on Snow Leopard
Expand Down
2 changes: 0 additions & 2 deletions Source/WTF/wtf/gobject/GMutexLocker.h
View file
Expand Up @@ -97,8 +97,6 @@ class GMutexLocker {

} // namespace WTF

using WTF::GMutexLocker;

#endif // USE(GLIB)

#endif // GMutexLocker_h
46 changes: 46 additions & 0 deletions Source/WebCore/ChangeLog
View file
@@ -1,3 +1,49 @@
2015-02-10 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] GMutexLocker build issue
https://bugs.webkit.org/show_bug.cgi?id=141381

Reviewed by Žan Doberšek.

Use always WTF::GMutexLocker because newer glib versions have a
GMutexLocker in the public API.

* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
(WebCore::AudioSourceProviderGStreamer::provideInput):
(WebCore::AudioSourceProviderGStreamer::handleAudioBuffer):
(WebCore::AudioSourceProviderGStreamer::clearAdapters):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
(WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkitVideoSinkTimeoutCallback):
(webkitVideoSinkRender):
(unlockSampleMutex):
(webkitVideoSinkUnlockStop):
(webkitVideoSinkStart):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcGetProperty):
(webKitWebSrcStop):
(webKitWebSrcStart):
(webKitWebSrcChangeState):
(webKitWebSrcQueryWithParent):
(webKitWebSrcGetUri):
(webKitWebSrcSetUri):
(webKitWebSrcNeedDataMainCb):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataMainCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekDataCb):
(webKitWebSrcSetMediaPlayer):
(StreamingClient::createReadBuffer):
(StreamingClient::handleResponseReceived):
(StreamingClient::handleDataReceived):
(StreamingClient::handleNotifyFinished):
(ResourceHandleStreamingClient::wasBlocked):
(ResourceHandleStreamingClient::cannotShowURL):

2015-01-26 Michael Catanzaro <mcatanzaro@igalia.com>

[GTK] gtkdoc does not appear in DevHelp
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
View file
Expand Up @@ -137,7 +137,7 @@ IntSize MediaPlayerPrivateGStreamerBase::naturalSize() const
if (!m_videoSize.isEmpty())
return m_videoSize;

GMutexLocker<GMutex> lock(m_sampleMutex);
WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return IntSize();

Expand Down Expand Up @@ -279,7 +279,7 @@ void MediaPlayerPrivateGStreamerBase::muteChanged()
#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
{
GMutexLocker<GMutex> lock(m_sampleMutex);
WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return nullptr;

Expand Down Expand Up @@ -330,7 +330,7 @@ void MediaPlayerPrivateGStreamerBase::triggerRepaint(GstSample* sample)
g_return_if_fail(GST_IS_SAMPLE(sample));

{
GMutexLocker<GMutex> lock(m_sampleMutex);
WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (m_sample)
gst_sample_unref(m_sample);
m_sample = gst_sample_ref(sample);
Expand Down Expand Up @@ -364,7 +364,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntR
if (!m_player->visible())
return;

GMutexLocker<GMutex> lock(m_sampleMutex);
WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return;

Expand Down
10 changes: 5 additions & 5 deletions Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
View file
Expand Up @@ -117,7 +117,7 @@ static void webkitVideoSinkTimeoutCallback(WebKitVideoSink* sink)
{
WebKitVideoSinkPrivate* priv = sink->priv;
GMutexLocker<GMutex> lock(priv->sampleMutex);
WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
GstSample* sample = priv->sample;
priv->sample = 0;
Expand All @@ -136,7 +136,7 @@ static GstFlowReturn webkitVideoSinkRender(GstBaseSink* baseSink, GstBuffer* buf
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
WebKitVideoSinkPrivate* priv = sink->priv;
GMutexLocker<GMutex> lock(priv->sampleMutex);
WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
if (priv->unlocked)
return GST_FLOW_OK;
Expand Down Expand Up @@ -234,7 +234,7 @@ static void webkitVideoSinkFinalize(GObject* object)
static void unlockSampleMutex(WebKitVideoSinkPrivate* priv)
{
GMutexLocker<GMutex> lock(priv->sampleMutex);
WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
if (priv->sample) {
gst_sample_unref(priv->sample);
Expand All @@ -260,7 +260,7 @@ static gboolean webkitVideoSinkUnlockStop(GstBaseSink* baseSink)
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
{
GMutexLocker<GMutex> lock(priv->sampleMutex);
WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
}
Expand All @@ -285,7 +285,7 @@ static gboolean webkitVideoSinkStart(GstBaseSink* baseSink)
{
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
GMutexLocker<GMutex> lock(priv->sampleMutex);
WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
return TRUE;
}
Expand Down
40 changes: 20 additions & 20 deletions Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
View file
Expand Up @@ -353,7 +353,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
WebKitWebSrcPrivate* priv = src->priv;

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
switch (propID) {
case PROP_IRADIO_NAME:
g_value_set_string(value, priv->iradioName);
Expand Down Expand Up @@ -393,7 +393,7 @@ static void webKitWebSrcStop(WebKitWebSrc* src)

ASSERT(isMainThread());

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));

bool seeking = priv->seekSource.isActive();

Expand Down Expand Up @@ -449,7 +449,7 @@ static void webKitWebSrcStart(WebKitWebSrc* src)

ASSERT(isMainThread());

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));

priv->pendingStart = FALSE;
priv->corsAccessCheck = CORSNoCheck;
Expand Down Expand Up @@ -542,7 +542,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
return ret;
}

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
GST_DEBUG_OBJECT(src, "READY->PAUSED");
Expand Down Expand Up @@ -579,15 +579,15 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
gst_query_parse_duration(query, &format, NULL);

GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
gst_query_set_duration(query, format, src->priv->size);
result = TRUE;
}
break;
}
case GST_QUERY_URI: {
GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
gst_query_set_uri(query, src->priv->uri);
result = TRUE;
break;
Expand Down Expand Up @@ -637,7 +637,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
gchar* ret;

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
ret = g_strdup(src->priv->uri);
return ret;
}
Expand All @@ -652,7 +652,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
return FALSE;
}

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));

g_free(priv->uri);
priv->uri = 0;
Expand Down Expand Up @@ -688,7 +688,7 @@ static void webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)

ASSERT(isMainThread());

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = FALSE;
locker.unlock();

Expand All @@ -703,7 +703,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)

GST_DEBUG_OBJECT(src, "Need more data: %u", length);

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (priv->needDataSource.isScheduled() || !priv->paused)
return;

Expand All @@ -718,7 +718,7 @@ static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)

ASSERT(isMainThread());

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = TRUE;
locker.unlock();

Expand All @@ -733,7 +733,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)

GST_DEBUG_OBJECT(src, "Have enough data");

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (priv->enoughDataSource.isScheduled() || priv->paused)
return;

Expand All @@ -756,7 +756,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
WebKitWebSrcPrivate* priv = src->priv;

GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (offset == priv->offset && priv->requestedOffset == priv->offset)
return TRUE;

Expand All @@ -775,7 +775,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
{
ASSERT(player);
GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
src->priv->player = player;
}

Expand Down Expand Up @@ -805,7 +805,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize

mapGstBuffer(buffer);

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->buffer = adoptGRef(buffer);
locker.unlock();

Expand All @@ -831,7 +831,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response, C
return;
}

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));

priv->corsAccessCheck = corsAccessCheck;

Expand Down Expand Up @@ -930,7 +930,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
WebKitWebSrcPrivate* priv = src->priv;

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));

GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);

Expand Down Expand Up @@ -999,7 +999,7 @@ void StreamingClient::handleNotifyFinished()

GST_DEBUG_OBJECT(src, "Have EOS");

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (!priv->seekSource.isActive()) {
locker.unlock();
gst_app_src_end_of_stream(priv->appsrc);
Expand Down Expand Up @@ -1158,7 +1158,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)

GST_ERROR_OBJECT(src, "Request was blocked");

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();

Expand All @@ -1172,7 +1172,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)

GST_ERROR_OBJECT(src, "Cannot show URL");

GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
uri.reset(g_strdup(src->priv->uri));
locker.unlock();

Expand Down

0 comments on commit 0c215f7

Please sign in to comment.