<!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>[172441] 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/172441">172441</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-12 03:39:07 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up GMutexLocker
https://bugs.webkit.org/show_bug.cgi?id=135833
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Don't dynamically allocate GMutex objects. Update GMutexLocker
initializations to pass in a GMutex reference, not a pointer.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(_WebKitVideoSinkPrivate::_WebKitVideoSinkPrivate): Initialize the GMutex.
(_WebKitVideoSinkPrivate::~_WebKitVideoSinkPrivate): Clear the GMutex.
(webkit_video_sink_init):
(webkitVideoSinkRender):
(webkitVideoSinkDispose):
* 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:
Place the GMutexLocker into the WTF namespace. There's no need for this
class to use FastMalloc since it's always allocated on the stack. The
constructor and class now operate on a GMutex reference. There's little
need for an additional inline specifier for methods defined in the header.
The mutex() method is removed as it was not used. m_val is renamed to a
more descriptive m_locked and is made a boolean.
* wtf/gobject/GMutexLocker.h:
(WTF::GMutexLocker::GMutexLocker):
(WTF::GMutexLocker::~GMutexLocker):
(WTF::GMutexLocker::lock):
(WTF::GMutexLocker::unlock):
(WebCore::GMutexLocker::GMutexLocker): Deleted.
(WebCore::GMutexLocker::~GMutexLocker): Deleted.
(WebCore::GMutexLocker::lock): Deleted.
(WebCore::GMutexLocker::unlock): Deleted.
(WebCore::GMutexLocker::mutex): Deleted.</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="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</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 (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WTF/ChangeLog 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-08-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Clean up GMutexLocker
+ https://bugs.webkit.org/show_bug.cgi?id=135833
+
+ Reviewed by Carlos Garcia Campos.
+
+ Place the GMutexLocker into the WTF namespace. There's no need for this
+ class to use FastMalloc since it's always allocated on the stack. The
+ constructor and class now operate on a GMutex reference. There's little
+ need for an additional inline specifier for methods defined in the header.
+ The mutex() method is removed as it was not used. m_val is renamed to a
+ more descriptive m_locked and is made a boolean.
+
+ * wtf/gobject/GMutexLocker.h:
+ (WTF::GMutexLocker::GMutexLocker):
+ (WTF::GMutexLocker::~GMutexLocker):
+ (WTF::GMutexLocker::lock):
+ (WTF::GMutexLocker::unlock):
+ (WebCore::GMutexLocker::GMutexLocker): Deleted.
+ (WebCore::GMutexLocker::~GMutexLocker): Deleted.
+ (WebCore::GMutexLocker::lock): Deleted.
+ (WebCore::GMutexLocker::unlock): Deleted.
+ (WebCore::GMutexLocker::mutex): Deleted.
+
+2014-08-12 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Make GRefPtr move-able
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135801
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfgobjectGMutexLockerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GMutexLocker.h (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gobject/GMutexLocker.h 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WTF/wtf/gobject/GMutexLocker.h 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -23,50 +23,50 @@
</span><span class="cx"> #if USE(GLIB)
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span><del>-
-#include <wtf/FastMalloc.h>
</del><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><del>- WTF_MAKE_NONCOPYABLE(GMutexLocker); WTF_MAKE_FAST_ALLOCATED;
-
</del><ins>+ WTF_MAKE_NONCOPYABLE(GMutexLocker);
</ins><span class="cx"> public:
</span><del>- inline explicit GMutexLocker(GMutex* mutex)
</del><ins>+ explicit GMutexLocker(GMutex& mutex)
</ins><span class="cx"> : m_mutex(mutex)
</span><del>- , m_val(0)
</del><ins>+ , m_locked(false)
</ins><span class="cx"> {
</span><span class="cx"> lock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline ~GMutexLocker() { unlock(); }
</del><ins>+ ~GMutexLocker()
+ {
+ unlock();
+ }
</ins><span class="cx">
</span><del>- inline void lock()
</del><ins>+ void lock()
</ins><span class="cx"> {
</span><del>- if (m_mutex && !m_val) {
- g_mutex_lock(m_mutex);
- m_val = 1;
</del><ins>+ if (!m_locked) {
+ g_mutex_lock(&m_mutex);
+ m_locked = true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline void unlock()
</del><ins>+ void unlock()
</ins><span class="cx"> {
</span><del>- if (m_mutex && m_val) {
- m_val = 0;
- g_mutex_unlock(m_mutex);
</del><ins>+ if (m_locked) {
+ m_locked = false;
+ g_mutex_unlock(&m_mutex);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline GMutex* mutex() const { return m_mutex; }
-
</del><span class="cx"> private:
</span><del>- GMutex* m_mutex;
- uint8_t m_val;
</del><ins>+ GMutex& m_mutex;
+ bool m_locked;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace WTF
</ins><span class="cx">
</span><ins>+using WTF::GMutexLocker;
+
</ins><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 (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-08-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Clean up GMutexLocker
+ https://bugs.webkit.org/show_bug.cgi?id=135833
+
+ Reviewed by Carlos Garcia Campos.
+
+ Don't dynamically allocate GMutex objects. Update GMutexLocker
+ initializations to pass in a GMutex reference, not a pointer.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+ (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (_WebKitVideoSinkPrivate::_WebKitVideoSinkPrivate): Initialize the GMutex.
+ (_WebKitVideoSinkPrivate::~_WebKitVideoSinkPrivate): Clear the GMutex.
+ (webkit_video_sink_init):
+ (webkitVideoSinkRender):
+ (webkitVideoSinkDispose):
+ * 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"> 2014-08-12 Eduardo Lima Mitev <elima@igalia.com>
</span><span class="cx"> [GTK] Adds dependency on GnuTLS 3.0+ for the implementation of subtle crypto algorithms
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133317
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -94,8 +94,7 @@
</span><span class="cx"> , m_volumeSignalHandler(0)
</span><span class="cx"> , m_muteSignalHandler(0)
</span><span class="cx"> {
</span><del>- m_bufferMutex = new GMutex;
- g_mutex_init(m_bufferMutex);
</del><ins>+ g_mutex_init(&m_bufferMutex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase()
</span><span class="lines">@@ -105,8 +104,7 @@
</span><span class="cx"> m_repaintHandler = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- g_mutex_clear(m_bufferMutex);
- delete m_bufferMutex;
</del><ins>+ g_mutex_clear(&m_bufferMutex);
</ins><span class="cx">
</span><span class="cx"> if (m_buffer)
</span><span class="cx"> gst_buffer_unref(m_buffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> MediaPlayer::ReadyState m_readyState;
</span><span class="cx"> MediaPlayer::NetworkState m_networkState;
</span><span class="cx"> IntSize m_size;
</span><del>- GMutex* m_bufferMutex;
</del><ins>+ GMutex m_bufferMutex;
</ins><span class="cx"> GstBuffer* m_buffer;
</span><span class="cx"> GMainLoopSource m_volumeTimerHandler;
</span><span class="cx"> GMainLoopSource m_muteTimerHandler;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -74,9 +74,19 @@
</span><span class="cx"> static guint webkitVideoSinkSignals[LAST_SIGNAL] = { 0, };
</span><span class="cx">
</span><span class="cx"> struct _WebKitVideoSinkPrivate {
</span><ins>+ _WebKitVideoSinkPrivate()
+ {
+ g_mutex_init(&bufferMutex);
+ }
+
+ ~_WebKitVideoSinkPrivate()
+ {
+ g_mutex_clear(&bufferMutex);
+ }
+
</ins><span class="cx"> GstBuffer* buffer;
</span><span class="cx"> GMainLoopSource timeoutSource;
</span><del>- GMutex* bufferMutex;
</del><ins>+ GMutex bufferMutex;
</ins><span class="cx"> GCond* dataCondition;
</span><span class="cx">
</span><span class="cx"> GstVideoInfo info;
</span><span class="lines">@@ -104,8 +114,6 @@
</span><span class="cx"> new (sink->priv) WebKitVideoSinkPrivate();
</span><span class="cx"> sink->priv->dataCondition = new GCond;
</span><span class="cx"> g_cond_init(sink->priv->dataCondition);
</span><del>- sink->priv->bufferMutex = new GMutex;
- g_mutex_init(sink->priv->bufferMutex);
</del><span class="cx">
</span><span class="cx"> gst_video_info_init(&sink->priv->info);
</span><span class="cx"> }
</span><span class="lines">@@ -220,7 +228,7 @@
</span><span class="cx"> priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::function<void()>(std::bind(webkitVideoSinkTimeoutCallback, sink)), G_PRIORITY_DEFAULT,
</span><span class="cx"> [sink] { gst_object_unref(sink); });
</span><span class="cx">
</span><del>- g_cond_wait(priv->dataCondition, priv->bufferMutex);
</del><ins>+ g_cond_wait(priv->dataCondition, &priv->bufferMutex);
</ins><span class="cx"> return GST_FLOW_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,12 +243,6 @@
</span><span class="cx"> priv->dataCondition = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (priv->bufferMutex) {
- g_mutex_clear(priv->bufferMutex);
- delete priv->bufferMutex;
- priv->bufferMutex = 0;
- }
-
</del><span class="cx"> G_OBJECT_CLASS(parent_class)->dispose(object);
</span><span class="cx"> }
</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 (172440 => 172441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-08-12 10:36:45 UTC (rev 172440)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-08-12 10:39:07 UTC (rev 172441)
</span><span class="lines">@@ -352,7 +352,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>+ GMutexLocker 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">@@ -391,7 +391,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>+ GMutexLocker 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">@@ -447,7 +447,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>+ GMutexLocker locker(*GST_OBJECT_GET_LOCK(src));
</ins><span class="cx">
</span><span class="cx"> priv->corsAccessCheck = CORSNoCheck;
</span><span class="cx">
</span><span class="lines">@@ -541,7 +541,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>+ 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">@@ -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 locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ 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">@@ -584,7 +584,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>+ 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">@@ -625,7 +625,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>+ 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">@@ -640,7 +640,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>+ 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">@@ -676,7 +676,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>+ GMutexLocker 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">@@ -691,7 +691,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>+ GMutexLocker 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">@@ -706,7 +706,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>+ GMutexLocker 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">@@ -721,7 +721,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>+ GMutexLocker 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">@@ -744,7 +744,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>+ 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">@@ -763,7 +763,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>+ 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">@@ -792,7 +792,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>+ 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">@@ -818,7 +818,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>+ 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">@@ -917,7 +917,7 @@
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
</span><span class="cx"> WebKitWebSrcPrivate* priv = src->priv;
</span><span class="cx">
</span><del>- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</del><ins>+ 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">@@ -986,7 +986,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>+ GMutexLocker 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">@@ -1145,7 +1145,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>+ 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">@@ -1159,7 +1159,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>+ 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>