<!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>[179866] trunk/Source</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/179866">179866</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-10 00:16:23 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] GMutexLocker build issue
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/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):
Source/WTF:
Remove using WTF::GMutexLocker from the header, since newer glib
versions have a GMutexLocker in the public API.
* wtf/gobject/GMutexLocker.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfgobjectGMutexLockerh">trunk/Source/WTF/wtf/gobject/GMutexLocker.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-02-09 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: tryFastCalloc is no longer "try"
</span></span></pre></div>
<a id="trunkSourceWTFwtfgobjectGMutexLockerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GMutexLocker.h (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -97,8 +97,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-using WTF::GMutexLocker;
-
</del><span class="cx"> #endif // USE(GLIB)
</span><span class="cx">
</span><span class="cx"> #endif // GMutexLocker_h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-02-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update WEBCORE_EXPORT to prepare to start using it.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderGStreamer::provideInput(AudioBus* bus, size_t framesToProcess)
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(m_adapterMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
</ins><span class="cx"> copyGStreamerBuffersToAudioChannel(m_frontLeftAdapter, bus, 0, framesToProcess);
</span><span class="cx"> copyGStreamerBuffersToAudioChannel(m_frontRightAdapter, bus, 1, framesToProcess);
</span><span class="cx"> }
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> GstAudioInfo info;
</span><span class="cx"> gst_audio_info_from_caps(&info, caps);
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(m_adapterMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
</ins><span class="cx">
</span><span class="cx"> // Check the first audio channel. The buffer is supposed to store
</span><span class="cx"> // data of a single channel anyway.
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> void AudioSourceProviderGStreamer::clearAdapters()
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(m_adapterMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
</ins><span class="cx"> gst_adapter_clear(m_frontLeftAdapter);
</span><span class="cx"> gst_adapter_clear(m_frontRightAdapter);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> if (!m_videoSize.isEmpty())
</span><span class="cx"> return m_videoSize;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(m_sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
</ins><span class="cx"> if (!m_sample)
</span><span class="cx"> return IntSize();
</span><span class="cx">
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(m_sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
</ins><span class="cx"> if (!m_sample)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> g_return_if_fail(GST_IS_SAMPLE(sample));
</span><span class="cx">
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(m_sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
</ins><span class="cx"> if (m_sample)
</span><span class="cx"> gst_sample_unref(m_sample);
</span><span class="cx"> m_sample = gst_sample_ref(sample);
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> if (!m_player->visible())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(m_sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
</ins><span class="cx"> if (!m_sample)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitVideoSinkPrivate* priv = sink->priv;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(priv->sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
</ins><span class="cx"> GstSample* sample = priv->sample;
</span><span class="cx"> priv->sample = 0;
</span><span class="cx">
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
</span><span class="cx"> WebKitVideoSinkPrivate* priv = sink->priv;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(priv->sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
</ins><span class="cx">
</span><span class="cx"> if (priv->unlocked)
</span><span class="cx"> return GST_FLOW_OK;
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">
</span><span class="cx"> static void unlockSampleMutex(WebKitVideoSinkPrivate* priv)
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(priv->sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
</ins><span class="cx">
</span><span class="cx"> if (priv->sample) {
</span><span class="cx"> gst_sample_unref(priv->sample);
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
</span><span class="cx">
</span><span class="cx"> {
</span><del>- GMutexLocker<GMutex> lock(priv->sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
</ins><span class="cx"> priv->unlocked = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> lock(priv->sampleMutex);
</del><ins>+ WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
</ins><span class="cx"> priv->unlocked = false;
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (179865 => 179866)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> switch (propID) {
</span><span class="cx"> case PROP_IRADIO_NAME:
</span><span class="cx"> g_value_set_string(value, priv->iradioName);
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> bool seeking = priv->seekSource.isActive();
</span><span class="cx">
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> priv->pendingStart = FALSE;
</span><span class="cx"> priv->didPassAccessControlCheck = false;
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> switch (transition) {
</span><span class="cx"> case GST_STATE_CHANGE_READY_TO_PAUSED:
</span><span class="cx"> GST_DEBUG_OBJECT(src, "READY->PAUSED");
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx"> gst_query_parse_duration(query, &format, NULL);
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
</span><span class="cx"> gst_query_set_duration(query, format, src->priv->size);
</span><span class="cx"> result = TRUE;
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GST_QUERY_URI: {
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> gst_query_set_uri(query, src->priv->uri);
</span><span class="cx"> result = TRUE;
</span><span class="cx"> break;
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
</span><span class="cx"> gchar* ret;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> ret = g_strdup(src->priv->uri);
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="lines">@@ -649,7 +649,7 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> g_free(priv->uri);
</span><span class="cx"> priv->uri = 0;
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> priv->paused = FALSE;
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Need more data: %u", length);
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (priv->needDataSource.isScheduled() || !priv->paused)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> priv->paused = TRUE;
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Have enough data");
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (priv->enoughDataSource.isScheduled() || priv->paused)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (offset == priv->offset && priv->requestedOffset == priv->offset)
</span><span class="cx"> return TRUE;
</span><span class="cx">
</span><span class="lines">@@ -776,7 +776,7 @@
</span><span class="cx"> void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(player);
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> src->priv->player = player;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -806,7 +806,7 @@
</span><span class="cx">
</span><span class="cx"> mapGstBuffer(buffer);
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> priv->buffer = adoptGRef(buffer);
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> if (priv->seekSource.isActive()) {
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Seek in progress, ignoring response");
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
</span><span class="cx">
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Have EOS");
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (!priv->seekSource.isActive()) {
</span><span class="cx"> locker.unlock();
</span><span class="cx"> gst_app_src_end_of_stream(priv->appsrc);
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Request was blocked");
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> uri.reset(g_strdup(src->priv->uri));
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Cannot show URL");
</span><span class="cx">
</span><del>- GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> uri.reset(g_strdup(src->priv->uri));
</span><span class="cx"> locker.unlock();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>