svn commit: r379206 - in head/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files webkit2-gtk3 webkit2-gtk3/files
Koop Mast
kwm at FreeBSD.org
Wed Feb 18 11:49:27 UTC 2015
Author: kwm
Date: Wed Feb 18 11:49:23 2015
New Revision: 379206
URL: https://svnweb.freebsd.org/changeset/ports/379206
QAT: https://qat.redports.org/buildarchive/r379206/
Log:
Backport upstream patches to fix the function collision with glib 2.37.4
which added the GMutexLocker function.
Obtained from: upstream (based on)
Added:
head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp (contents, props changed)
head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp (contents, props changed)
head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp (contents, props changed)
head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp (contents, props changed)
head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp (contents, props changed)
head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp (contents, props changed)
head/www/webkit2-gtk3/files/patch-gmutexlocker (contents, props changed)
Modified:
head/www/webkit-gtk2/Makefile
head/www/webkit-gtk3/Makefile
head/www/webkit2-gtk3/Makefile
Modified: head/www/webkit-gtk2/Makefile
==============================================================================
--- head/www/webkit-gtk2/Makefile Wed Feb 18 11:32:22 2015 (r379205)
+++ head/www/webkit-gtk2/Makefile Wed Feb 18 11:49:23 2015 (r379206)
@@ -3,6 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.4.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
Added: head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,29 @@
+--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-02-12 01:22:34.449468000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-12 01:24:42.777620000 +0100
+@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
+ #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+ PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
+ {
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ if (!m_buffer)
+ return nullptr;
+
+@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
+ g_return_if_fail(GST_IS_BUFFER(buffer));
+
+ {
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ gst_buffer_replace(&m_buffer, buffer);
+ }
+
+@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
+ if (!m_player->visible())
+ return;
+
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ if (!m_buffer)
+ return;
+
Added: head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,47 @@
+--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-02-12 01:22:25.261692000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-12 01:24:34.127107000 +0100
+@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
+ WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ GstBuffer* buffer = priv->buffer;
+ priv->buffer = 0;
+ priv->timeoutId = 0;
+@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRend
+ WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->unlocked)
+ return GST_FLOW_OK;
+@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(G
+
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->buffer) {
+ gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockSto
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ }
+
+@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst
+ {
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ return TRUE;
+ }
Added: head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,200 @@
+--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-02-12 01:22:42.081133000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-12 01:25:08.298076000 +0100
+@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
+
+ switch (propID) {
+ case PROP_IRADIO_MODE: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->iradioMode = g_value_get_boolean(value);
+ break;
+ }
+@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (propID) {
+ case PROP_IRADIO_MODE:
+ g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ bool seeking = priv->seekID;
+
+@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->startID = 0;
+ priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc
+ return ret;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar
+ gst_query_parse_duration(query, &format, NULL);
+
+ GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker 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;
+@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar
+ break;
+ }
+ case GST_QUERY_URI: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ gst_query_set_uri(query, src->priv->uri);
+ result = TRUE;
+ break;
+@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+ gchar* ret;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ ret = g_strdup(src->priv->uri);
+ return ret;
+ }
+@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR
+ return FALSE;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ g_free(priv->uri);
+ priv->uri = 0;
+@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->needDataID)
+ return FALSE;
+@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp
+
+ GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->needDataID || !priv->paused) {
+ return;
+ }
+@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->enoughDataID)
+ return FALSE;
+@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst
+
+ GST_DEBUG_OBJECT(src, "Have enough data");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->enoughDataID || priv->paused) {
+ return;
+ }
+@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->seekID)
+ return FALSE;
+@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (offset == priv->offset && priv->requestedOffset == priv->offset)
+ return TRUE;
+
+@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+ ASSERT(player);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ src->priv->player = player;
+ }
+
+@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer(
+
+ mapGstBuffer(buffer);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->buffer = adoptGRef(buffer);
+ locker.unlock();
+
+@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece
+ return;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->corsAccessCheck = corsAccessCheck;
+
+@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker 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);
+
+@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish
+
+ GST_DEBUG_OBJECT(src, "Have EOS");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (!priv->seekID) {
+ locker.unlock();
+ gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB
+
+ GST_ERROR_OBJECT(src, "Request was blocked");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
+@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann
+
+ GST_ERROR_OBJECT(src, "Cannot show URL");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
Modified: head/www/webkit-gtk3/Makefile
==============================================================================
--- head/www/webkit-gtk3/Makefile Wed Feb 18 11:32:22 2015 (r379205)
+++ head/www/webkit-gtk3/Makefile Wed Feb 18 11:49:23 2015 (r379206)
@@ -3,6 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.4.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk3
Added: head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamerBase.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,29 @@
+--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-02-12 01:22:34.449468000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-12 01:24:42.777620000 +0100
+@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::mu
+ #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+ PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
+ {
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ if (!m_buffer)
+ return nullptr;
+
+@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::tr
+ g_return_if_fail(GST_IS_BUFFER(buffer));
+
+ {
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ gst_buffer_replace(&m_buffer, buffer);
+ }
+
+@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::pa
+ if (!m_player->visible())
+ return;
+
+- GMutexLocker lock(m_bufferMutex);
++ WebCore::GMutexLocker lock(m_bufferMutex);
+ if (!m_buffer)
+ return;
+
Added: head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_VideoSinkGStreamer.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,47 @@
+--- Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-02-12 01:22:25.261692000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-12 01:24:34.127107000 +0100
+@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCa
+ WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ GstBuffer* buffer = priv->buffer;
+ priv->buffer = 0;
+ priv->timeoutId = 0;
+@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRend
+ WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+ WebKitVideoSinkPrivate* priv = sink->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->unlocked)
+ return GST_FLOW_OK;
+@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(G
+
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+
+ if (priv->buffer) {
+ gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockSto
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+ {
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ }
+
+@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(Gst
+ {
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+- GMutexLocker lock(priv->bufferMutex);
++ WebCore::GMutexLocker lock(priv->bufferMutex);
+ priv->unlocked = false;
+ return TRUE;
+ }
Added: head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,200 @@
+--- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-02-12 01:22:42.081133000 +0100
++++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-12 01:25:08.298076000 +0100
+@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObj
+
+ switch (propID) {
+ case PROP_IRADIO_MODE: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->iradioMode = g_value_get_boolean(value);
+ break;
+ }
+@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObj
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (propID) {
+ case PROP_IRADIO_MODE:
+ g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitW
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ bool seeking = priv->seekID;
+
+@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKit
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->startID = 0;
+ priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrc
+ return ret;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithPar
+ gst_query_parse_duration(query, &format, NULL);
+
+ GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker 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;
+@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithPar
+ break;
+ }
+ case GST_QUERY_URI: {
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ gst_query_set_uri(query, src->priv->uri);
+ result = TRUE;
+ break;
+@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIH
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+ gchar* ret;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ ret = g_strdup(src->priv->uri);
+ return ret;
+ }
+@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstUR
+ return FALSE;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ g_free(priv->uri);
+ priv->uri = 0;
+@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMain
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->needDataID)
+ return FALSE;
+@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAp
+
+ GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->needDataID || !priv->paused) {
+ return;
+ }
+@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMa
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->enoughDataID)
+ return FALSE;
+@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(Gst
+
+ GST_DEBUG_OBJECT(src, "Have enough data");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (priv->enoughDataID || priv->paused) {
+ return;
+ }
+@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(W
+
+ ASSERT(isMainThread());
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ // already stopped
+ if (!priv->seekID)
+ return FALSE;
+@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ WebKitWebSrcPrivate* priv = src->priv;
+
+ GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (offset == priv->offset && priv->requestedOffset == priv->offset)
+ return TRUE;
+
+@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+ ASSERT(player);
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ src->priv->player = player;
+ }
+
+@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer(
+
+ mapGstBuffer(buffer);
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ priv->buffer = adoptGRef(buffer);
+ locker.unlock();
+
+@@ -867,7 +867,7 @@ void StreamingClient::handleResponseRece
+ return;
+ }
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+
+ priv->corsAccessCheck = corsAccessCheck;
+
+@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived
+ WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+ WebKitWebSrcPrivate* priv = src->priv;
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker 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);
+
+@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinish
+
+ GST_DEBUG_OBJECT(src, "Have EOS");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ if (!priv->seekID) {
+ locker.unlock();
+ gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasB
+
+ GST_ERROR_OBJECT(src, "Request was blocked");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
+@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cann
+
+ GST_ERROR_OBJECT(src, "Cannot show URL");
+
+- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ uri.reset(g_strdup(src->priv->uri));
+ locker.unlock();
+
Modified: head/www/webkit2-gtk3/Makefile
==============================================================================
--- head/www/webkit2-gtk3/Makefile Wed Feb 18 11:32:22 2015 (r379205)
+++ head/www/webkit2-gtk3/Makefile Wed Feb 18 11:49:23 2015 (r379206)
@@ -3,6 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.6.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3
Added: head/www/webkit2-gtk3/files/patch-gmutexlocker
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/webkit2-gtk3/files/patch-gmutexlocker Wed Feb 18 11:49:23 2015 (r379206)
@@ -0,0 +1,373 @@
+--- ./Source/WTF/wtf/gobject/GMutexLocker.h.orig 2015-02-18 10:08:21.672199000 +0100
++++ ./Source/WTF/wtf/gobject/GMutexLocker.h 2015-02-18 10:09:57.152875000 +0100
+@@ -97,8 +97,6 @@ private:
+
+ } // namespace WTF
+
+-using WTF::GMutexLocker;
+-
+ #endif // USE(GLIB)
+
+ #endif // GMutexLocker_h
+--- ./Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp.orig 2015-02-18 10:08:28.231733000 +0100
++++ ./Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp 2015-02-18 10:10:10.991946000 +0100
+@@ -46,7 +46,7 @@ GThreadSafeMainLoopSource::~GThreadSafeM
+
+ void GThreadSafeMainLoopSource::cancel()
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+
+ // The general cancellable object should only be present if we're currently dispatching this GMainLoopSource.
+ ASSERT(!m_cancellable || m_status == Dispatching);
+@@ -62,49 +62,49 @@ void GThreadSafeMainLoopSource::cancel()
+
+ void GThreadSafeMainLoopSource::schedule(const char* name, std::function<void ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::schedule(name, function, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ void GThreadSafeMainLoopSource::schedule(const char* name, std::function<bool ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::schedule(name, function, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+ }
+
+ bool GThreadSafeMainLoopSource::prepareVoidCallback(Context& context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ bool retval = GMainLoopSource::prepareVoidCallback(context);
+ m_cancellable = context.cancellable;
+ return retval;
+@@ -112,7 +112,7 @@ bool GThreadSafeMainLoopSource::prepareV
+
+ void GThreadSafeMainLoopSource::finishVoidCallback()
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::finishVoidCallback();
+ m_cancellable = nullptr;
+ }
+@@ -136,7 +136,7 @@ void GThreadSafeMainLoopSource::voidCall
+
+ bool GThreadSafeMainLoopSource::prepareBoolCallback(Context& context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ bool retval = GMainLoopSource::prepareBoolCallback(context);
+ m_cancellable = context.cancellable;
+ return retval;
+@@ -144,7 +144,7 @@ bool GThreadSafeMainLoopSource::prepareB
+
+ void GThreadSafeMainLoopSource::finishBoolCallback(bool retval, Context& context)
+ {
+- GMutexLocker<GRecMutex> locker(m_mutex);
++ WTF::GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::finishBoolCallback(retval, context);
+ m_cancellable = nullptr;
+ }
+--- ./Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-02-18 10:08:00.153357000 +0100
++++ ./Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-02-18 10:09:26.434793000 +0100
+@@ -137,7 +137,7 @@ IntSize MediaPlayerPrivateGStreamerBase:
+ 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 @@ void MediaPlayerPrivateGStreamerBase::mu
+ #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 @@ void MediaPlayerPrivateGStreamerBase::tr
+ 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 @@ void MediaPlayerPrivateGStreamerBase::pa
+ if (!m_player->visible())
+ return;
+
+- GMutexLocker<GMutex> lock(m_sampleMutex);
++ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
+ if (!m_sample)
+ return;
+
+--- ./Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-02-18 10:07:53.753832000 +0100
++++ ./Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-02-18 10:09:19.395190000 +0100
+@@ -117,7 +117,7 @@ static void webkitVideoSinkTimeoutCallba
+ {
+ 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 @@ static GstFlowReturn webkitVideoSinkRend
+ 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 webkitVideoSinkFinalize(GObj
+
+ 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 @@ static gboolean webkitVideoSinkUnlockSto
+ 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 @@ static gboolean webkitVideoSinkStart(Gst
+ {
+ WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+
+- GMutexLocker<GMutex> lock(priv->sampleMutex);
++ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
+ priv->unlocked = false;
+ return TRUE;
+ }
+--- ./Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-02-18 10:08:08.120995000 +0100
++++ ./Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-18 10:09:47.889567000 +0100
+@@ -353,7 +353,7 @@ static void webKitWebSrcGetProperty(GObj
+ 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);
+@@ -393,7 +393,7 @@ static void webKitWebSrcStop(WebKitWebSr
+
+ ASSERT(isMainThread());
+
+- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
++ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+
+ bool seeking = priv->seekSource.isActive();
+
+@@ -449,7 +449,7 @@ static void webKitWebSrcStart(WebKitWebS
+
+ 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;
+@@ -542,7 +542,7 @@ static GstStateChangeReturn webKitWebSrc
+ 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");
+@@ -579,7 +579,7 @@ static gboolean webKitWebSrcQueryWithPar
+ 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;
+@@ -587,7 +587,7 @@ static gboolean webKitWebSrcQueryWithPar
+ 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;
+@@ -637,7 +637,7 @@ static gchar* webKitWebSrcGetUri(GstURIH
+ 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;
+ }
+@@ -652,7 +652,7 @@ static gboolean webKitWebSrcSetUri(GstUR
+ 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;
+@@ -688,7 +688,7 @@ static void webKitWebSrcNeedDataMainCb(W
+
+ ASSERT(isMainThread());
+
+- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
++ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ priv->paused = FALSE;
+ locker.unlock();
+
+@@ -703,7 +703,7 @@ static void webKitWebSrcNeedDataCb(GstAp
+
+ 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;
+
+@@ -718,7 +718,7 @@ static void webKitWebSrcEnoughDataMainCb
+
+ ASSERT(isMainThread());
+
+- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
++ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+ priv->paused = TRUE;
+ locker.unlock();
+
+@@ -733,7 +733,7 @@ static void webKitWebSrcEnoughDataCb(Gst
+
+ 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;
+
+@@ -756,7 +756,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ 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;
+
+@@ -775,7 +775,7 @@ static gboolean webKitWebSrcSeekDataCb(G
+ 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;
+ }
+
+@@ -805,7 +805,7 @@ char* StreamingClient::createReadBuffer(
+
+ 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();
+
+@@ -831,7 +831,7 @@ void StreamingClient::handleResponseRece
+ return;
+ }
+
+- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
++ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
+
+ priv->corsAccessCheck = corsAccessCheck;
+
+@@ -930,7 +930,7 @@ void StreamingClient::handleDataReceived
+ 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);
+
+@@ -999,7 +999,7 @@ void StreamingClient::handleNotifyFinish
+
+ 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);
+@@ -1158,7 +1158,7 @@ void ResourceHandleStreamingClient::wasB
+
+ 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();
+
+@@ -1172,7 +1172,7 @@ void ResourceHandleStreamingClient::cann
+
+ 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();
+
More information about the svn-ports-head
mailing list