<!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>[182456] releases/WebKitGTK/webkit-2.4/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/182456">182456</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-07 02:23:10 -0700 (Tue, 07 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Fix the build with newer GLib.
Source/WebCore:
Use WTF::GMutexLocker.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkitVideoSinkTimeoutCallback):
(webkitVideoSinkRender):
(unlockBufferMutex):
(webkitVideoSinkUnlockStop):
(webkitVideoSinkStart):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcSetProperty):
(webKitWebSrcGetProperty):
(webKitWebSrcStop):
(webKitWebSrcStart):
(webKitWebSrcChangeState):
(webKitWebSrcQueryWithParent):
(webKitWebSrcGetUri):
(webKitWebSrcSetUri):
(webKitWebSrcNeedDataMainCb):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataMainCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekMainCb):
(webKitWebSrcSeekDataCb):
(webKitWebSrcSetMediaPlayer):
(StreamingClient::createReadBuffer):
(StreamingClient::handleResponseReceived):
(StreamingClient::handleDataReceived):
(StreamingClient::handleNotifyFinished):
(ResourceHandleStreamingClient::wasBlocked):
(ResourceHandleStreamingClient::cannotShowURL):
Source/WTF:
* wtf/gobject/GMutexLocker.h: Move to the WTF namespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFChangeLog">releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfgobjectGMutexLockerh">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GMutexLocker.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2015-04-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix the build with newer GLib.
+
+ * wtf/gobject/GMutexLocker.h: Move to the WTF namespace.
+
</ins><span class="cx"> 2014-10-23 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix build on Hurd
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfgobjectGMutexLockerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GMutexLocker.h (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GMutexLocker.h 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GMutexLocker.h 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+namespace WTF {
</ins><span class="cx">
</span><span class="cx"> class GMutexLocker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GMutexLocker); WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-04-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Unreviewed. Fix the build with newer GLib.
+
+ Use WTF::GMutexLocker.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
+ (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
+ (WebCore::MediaPlayerPrivateGStreamerBase::paint):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkitVideoSinkTimeoutCallback):
+ (webkitVideoSinkRender):
+ (unlockBufferMutex):
+ (webkitVideoSinkUnlockStop):
+ (webkitVideoSinkStart):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcSetProperty):
+ (webKitWebSrcGetProperty):
+ (webKitWebSrcStop):
+ (webKitWebSrcStart):
+ (webKitWebSrcChangeState):
+ (webKitWebSrcQueryWithParent):
+ (webKitWebSrcGetUri):
+ (webKitWebSrcSetUri):
+ (webKitWebSrcNeedDataMainCb):
+ (webKitWebSrcNeedDataCb):
+ (webKitWebSrcEnoughDataMainCb):
+ (webKitWebSrcEnoughDataCb):
+ (webKitWebSrcSeekMainCb):
+ (webKitWebSrcSeekDataCb):
+ (webKitWebSrcSetMediaPlayer):
+ (StreamingClient::createReadBuffer):
+ (StreamingClient::handleResponseReceived):
+ (StreamingClient::handleDataReceived):
+ (StreamingClient::handleNotifyFinished):
+ (ResourceHandleStreamingClient::wasBlocked):
+ (ResourceHandleStreamingClient::cannotShowURL):
+
</ins><span class="cx"> 2014-11-10 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Crash in WebCore::Node::getFlag
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
</span><span class="cx"> {
</span><del>- GMutexLocker lock(m_bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(m_bufferMutex);
</ins><span class="cx"> if (!m_buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> g_return_if_fail(GST_IS_BUFFER(buffer));
</span><span class="cx">
</span><span class="cx"> {
</span><del>- GMutexLocker lock(m_bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(m_bufferMutex);
</ins><span class="cx"> gst_buffer_replace(&m_buffer, buffer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> if (!m_player->visible())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GMutexLocker lock(m_bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(m_bufferMutex);
</ins><span class="cx"> if (!m_buffer)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
</span><span class="cx"> WebKitVideoSinkPrivate* priv = sink->priv;
</span><span class="cx">
</span><del>- GMutexLocker lock(priv->bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(priv->bufferMutex);
</ins><span class="cx"> GstBuffer* buffer = priv->buffer;
</span><span class="cx"> priv->buffer = 0;
</span><span class="cx"> priv->timeoutId = 0;
</span><span class="lines">@@ -140,7 +140,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 lock(priv->bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(priv->bufferMutex);
</ins><span class="cx">
</span><span class="cx"> if (priv->unlocked)
</span><span class="cx"> return GST_FLOW_OK;
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">
</span><span class="cx"> static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
</span><span class="cx"> {
</span><del>- GMutexLocker lock(priv->bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(priv->bufferMutex);
</ins><span class="cx">
</span><span class="cx"> if (priv->buffer) {
</span><span class="cx"> gst_buffer_unref(priv->buffer);
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
</span><span class="cx">
</span><span class="cx"> {
</span><del>- GMutexLocker lock(priv->bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(priv->bufferMutex);
</ins><span class="cx"> priv->unlocked = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
</span><span class="cx">
</span><del>- GMutexLocker lock(priv->bufferMutex);
</del><ins>+ WTF::GMutexLocker lock(priv->bufferMutex);
</ins><span class="cx"> priv->unlocked = false;
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (182455 => 182456)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-04-07 08:11:06 UTC (rev 182455)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-04-07 09:23:10 UTC (rev 182456)
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx">
</span><span class="cx"> switch (propID) {
</span><span class="cx"> case PROP_IRADIO_MODE: {
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> priv->iradioMode = g_value_get_boolean(value);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -364,7 +364,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> switch (propID) {
</span><span class="cx"> case PROP_IRADIO_MODE:
</span><span class="cx"> g_value_set_boolean(value, priv->iradioMode);
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> bool seeking = priv->seekID;
</span><span class="cx">
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> priv->startID = 0;
</span><span class="cx"> priv->corsAccessCheck = CORSNoCheck;
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -604,7 +604,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -612,7 +612,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GST_QUERY_URI: {
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -653,7 +653,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
</span><span class="cx"> gchar* ret;
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -668,7 +668,7 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -704,7 +704,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> // already stopped
</span><span class="cx"> if (!priv->needDataID)
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -725,7 +725,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (priv->needDataID || !priv->paused) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -739,7 +739,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> // already stopped
</span><span class="cx"> if (!priv->enoughDataID)
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -760,7 +760,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Have enough data");
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (priv->enoughDataID || priv->paused) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> // already stopped
</span><span class="cx"> if (!priv->seekID)
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -792,7 +792,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -811,7 +811,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -841,7 +841,7 @@
</span><span class="cx">
</span><span class="cx"> mapGstBuffer(buffer);
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -867,7 +867,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> priv->corsAccessCheck = corsAccessCheck;
</span><span class="cx">
</span><span class="lines">@@ -966,7 +966,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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -1035,7 +1035,7 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Have EOS");
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</ins><span class="cx"> if (!priv->seekID) {
</span><span class="cx"> locker.unlock();
</span><span class="cx"> gst_app_src_end_of_stream(priv->appsrc);
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Request was blocked");
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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">@@ -1208,7 +1208,7 @@
</span><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Cannot show URL");
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ WTF::GMutexLocker 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>