Diff
Modified: trunk/Source/WTF/ChangeLog (179865 => 179866)
--- trunk/Source/WTF/ChangeLog 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WTF/ChangeLog 2015-02-10 08:16:23 UTC (rev 179866)
@@ -1,3 +1,15 @@
+2015-02-10 Carlos Garcia Campos <cgar...@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:
+
2015-02-09 Alexey Proskuryakov <a...@apple.com>
REGRESSION: tryFastCalloc is no longer "try"
Modified: trunk/Source/WTF/wtf/gobject/GMutexLocker.h (179865 => 179866)
--- trunk/Source/WTF/wtf/gobject/GMutexLocker.h 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WTF/wtf/gobject/GMutexLocker.h 2015-02-10 08:16:23 UTC (rev 179866)
@@ -97,8 +97,6 @@
} // namespace WTF
-using WTF::GMutexLocker;
-
#endif // USE(GLIB)
#endif // GMutexLocker_h
Modified: trunk/Source/WebCore/ChangeLog (179865 => 179866)
--- trunk/Source/WebCore/ChangeLog 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WebCore/ChangeLog 2015-02-10 08:16:23 UTC (rev 179866)
@@ -1,3 +1,49 @@
+2015-02-10 Carlos Garcia Campos <cgar...@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-02-09 Alex Christensen <achristen...@webkit.org>
Update WEBCORE_EXPORT to prepare to start using it.
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (179865 => 179866)
--- trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-02-10 08:16:23 UTC (rev 179866)
@@ -150,7 +150,7 @@
void AudioSourceProviderGStreamer::provideInput(AudioBus* bus, size_t framesToProcess)
{
- GMutexLocker<GMutex> lock(m_adapterMutex);
+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
copyGStreamerBuffersToAudioChannel(m_frontLeftAdapter, bus, 0, framesToProcess);
copyGStreamerBuffersToAudioChannel(m_frontRightAdapter, bus, 1, framesToProcess);
}
@@ -177,7 +177,7 @@
GstAudioInfo info;
gst_audio_info_from_caps(&info, caps);
- GMutexLocker<GMutex> lock(m_adapterMutex);
+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
// Check the first audio channel. The buffer is supposed to store
// data of a single channel anyway.
@@ -339,7 +339,7 @@
void AudioSourceProviderGStreamer::clearAdapters()
{
- GMutexLocker<GMutex> lock(m_adapterMutex);
+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
gst_adapter_clear(m_frontLeftAdapter);
gst_adapter_clear(m_frontRightAdapter);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (179865 => 179866)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-10 08:16:23 UTC (rev 179866)
@@ -137,7 +137,7 @@
if (!m_videoSize.isEmpty())
return m_videoSize;
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return IntSize();
@@ -279,7 +279,7 @@
#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;
@@ -330,7 +330,7 @@
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);
@@ -364,7 +364,7 @@
if (!m_player->visible())
return;
- GMutexLocker<GMutex> lock(m_sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
if (!m_sample)
return;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (179865 => 179866)
--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-10 08:16:23 UTC (rev 179866)
@@ -117,7 +117,7 @@
{
WebKitVideoSinkPrivate* priv = sink->priv;
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
GstSample* sample = priv->sample;
priv->sample = 0;
@@ -136,7 +136,7 @@
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;
@@ -234,7 +234,7 @@
static void unlockSampleMutex(WebKitVideoSinkPrivate* priv)
{
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
if (priv->sample) {
gst_sample_unref(priv->sample);
@@ -260,7 +260,7 @@
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
{
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
}
@@ -285,7 +285,7 @@
{
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- GMutexLocker<GMutex> lock(priv->sampleMutex);
+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
priv->unlocked = false;
return TRUE;
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (179865 => 179866)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-10 07:40:53 UTC (rev 179865)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-10 08:16:23 UTC (rev 179866)
@@ -338,7 +338,7 @@
WebKitWebSrc* src = ""
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);
@@ -378,7 +378,7 @@
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
bool seeking = priv->seekSource.isActive();
@@ -436,7 +436,7 @@
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->pendingStart = FALSE;
priv->didPassAccessControlCheck = false;
@@ -539,7 +539,7 @@
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");
@@ -576,7 +576,7 @@
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;
@@ -584,7 +584,7 @@
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;
@@ -634,7 +634,7 @@
WebKitWebSrc* src = ""
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;
}
@@ -649,7 +649,7 @@
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;
@@ -685,7 +685,7 @@
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = FALSE;
locker.unlock();
@@ -702,7 +702,7 @@
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;
@@ -717,7 +717,7 @@
ASSERT(isMainThread());
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
priv->paused = TRUE;
locker.unlock();
@@ -734,7 +734,7 @@
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;
@@ -757,7 +757,7 @@
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;
@@ -776,7 +776,7 @@
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;
}
@@ -806,7 +806,7 @@
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();
@@ -828,7 +828,7 @@
return;
}
- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
if (priv->seekSource.isActive()) {
GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
@@ -925,7 +925,7 @@
WebKitWebSrc* 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);
@@ -994,7 +994,7 @@
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);
@@ -1131,7 +1131,7 @@
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();
@@ -1145,7 +1145,7 @@
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();
