⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 179866 in webkit


Ignore:
Timestamp:
Feb 10, 2015, 12:16:23 AM (12 years ago)
Author:
Carlos Garcia Campos
Message:

[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:
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r179855 r179866  
     12015-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] GMutexLocker build issue
     4        https://bugs.webkit.org/show_bug.cgi?id=141381
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Remove using WTF::GMutexLocker from the header, since newer glib
     9        versions have a GMutexLocker in the public API.
     10
     11        * wtf/gobject/GMutexLocker.h:
     12
    1132015-02-09  Alexey Proskuryakov  <ap@apple.com>
    214

  • trunk/Source/WTF/wtf/gobject/GMutexLocker.h

    r174632 r179866  
    9898} // namespace WTF
    9999
    100 using WTF::GMutexLocker;
    101 
    102100#endif // USE(GLIB)
    103101

  • trunk/Source/WebCore/ChangeLog

    r179861 r179866  
     12015-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] GMutexLocker build issue
     4        https://bugs.webkit.org/show_bug.cgi?id=141381
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Use always WTF::GMutexLocker because newer glib versions have a
     9        GMutexLocker in the public API.
     10
     11        * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
     12        (WebCore::AudioSourceProviderGStreamer::provideInput):
     13        (WebCore::AudioSourceProviderGStreamer::handleAudioBuffer):
     14        (WebCore::AudioSourceProviderGStreamer::clearAdapters):
     15        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     16        (WebCore::MediaPlayerPrivateGStreamerBase::naturalSize):
     17        (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
     18        (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
     19        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
     20        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
     21        (webkitVideoSinkTimeoutCallback):
     22        (webkitVideoSinkRender):
     23        (unlockSampleMutex):
     24        (webkitVideoSinkUnlockStop):
     25        (webkitVideoSinkStart):
     26        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
     27        (webKitWebSrcGetProperty):
     28        (webKitWebSrcStop):
     29        (webKitWebSrcStart):
     30        (webKitWebSrcChangeState):
     31        (webKitWebSrcQueryWithParent):
     32        (webKitWebSrcGetUri):
     33        (webKitWebSrcSetUri):
     34        (webKitWebSrcNeedDataMainCb):
     35        (webKitWebSrcNeedDataCb):
     36        (webKitWebSrcEnoughDataMainCb):
     37        (webKitWebSrcEnoughDataCb):
     38        (webKitWebSrcSeekDataCb):
     39        (webKitWebSrcSetMediaPlayer):
     40        (StreamingClient::createReadBuffer):
     41        (StreamingClient::handleResponseReceived):
     42        (StreamingClient::handleDataReceived):
     43        (StreamingClient::handleNotifyFinished):
     44        (ResourceHandleStreamingClient::wasBlocked):
     45        (ResourceHandleStreamingClient::cannotShowURL):
     46
    1472015-02-09  Alex Christensen  <achristensen@webkit.org>
    248

  • trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp

    r177058 r179866  
    151151void AudioSourceProviderGStreamer::provideInput(AudioBus* bus, size_t framesToProcess)
    152152{
    153     GMutexLocker<GMutex> lock(m_adapterMutex);
     153    WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
    154154    copyGStreamerBuffersToAudioChannel(m_frontLeftAdapter, bus, 0, framesToProcess);
    155155    copyGStreamerBuffersToAudioChannel(m_frontRightAdapter, bus, 1, framesToProcess);
    … …  
    178178    gst_audio_info_from_caps(&info, caps);
    179179
    180     GMutexLocker<GMutex> lock(m_adapterMutex);
     180    WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
    181181
    182182    // Check the first audio channel. The buffer is supposed to store
    … …  
    340340void AudioSourceProviderGStreamer::clearAdapters()
    341341{
    342     GMutexLocker<GMutex> lock(m_adapterMutex);
     342    WTF::GMutexLocker<GMutex> lock(m_adapterMutex);
    343343    gst_adapter_clear(m_frontLeftAdapter);
    344344    gst_adapter_clear(m_frontRightAdapter);

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r175370 r179866  
    138138        return m_videoSize;
    139139
    140     GMutexLocker<GMutex> lock(m_sampleMutex);
     140    WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
    141141    if (!m_sample)
    142142        return IntSize();
    … …  
    280280PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
    281281{
    282     GMutexLocker<GMutex> lock(m_sampleMutex);
     282    WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
    283283    if (!m_sample)
    284284        return nullptr;
    … …  
    331331
    332332    {
    333         GMutexLocker<GMutex> lock(m_sampleMutex);
     333        WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
    334334        if (m_sample)
    335335            gst_sample_unref(m_sample);
    … …  
    365365        return;
    366366
    367     GMutexLocker<GMutex> lock(m_sampleMutex);
     367    WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
    368368    if (!m_sample)
    369369        return;

  • trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

    r175370 r179866  
    118118    WebKitVideoSinkPrivate* priv = sink->priv;
    119119
    120     GMutexLocker<GMutex> lock(priv->sampleMutex);
     120    WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
    121121    GstSample* sample = priv->sample;
    122122    priv->sample = 0;
    … …  
    137137    WebKitVideoSinkPrivate* priv = sink->priv;
    138138
    139     GMutexLocker<GMutex> lock(priv->sampleMutex);
     139    WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
    140140
    141141    if (priv->unlocked)
    … …  
    235235static void unlockSampleMutex(WebKitVideoSinkPrivate* priv)
    236236{
    237     GMutexLocker<GMutex> lock(priv->sampleMutex);
     237    WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
    238238
    239239    if (priv->sample) {
    … …  
    261261
    262262    {
    263         GMutexLocker<GMutex> lock(priv->sampleMutex);
     263        WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
    264264        priv->unlocked = false;
    265265    }
    … …  
    286286    WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
    287287
    288     GMutexLocker<GMutex> lock(priv->sampleMutex);
     288    WTF::GMutexLocker<GMutex> lock(priv->sampleMutex);
    289289    priv->unlocked = false;
    290290    return TRUE;

  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r177279 r179866  
    339339    WebKitWebSrcPrivate* priv = src->priv;
    340340
    341     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     341    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    342342    switch (propID) {
    343343    case PROP_IRADIO_NAME:
    … …  
    379379    ASSERT(isMainThread());
    380380
    381     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     381    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    382382
    383383    bool seeking = priv->seekSource.isActive();
    … …  
    437437    ASSERT(isMainThread());
    438438
    439     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     439    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    440440
    441441    priv->pendingStart = FALSE;
    … …  
    540540    }
    541541
    542     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     542    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    543543    switch (transition) {
    544544    case GST_STATE_CHANGE_READY_TO_PAUSED:
    … …  
    577577
    578578        GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
    579         GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     579        WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    580580        if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
    581581            gst_query_set_duration(query, format, src->priv->size);
    … …  
    585585    }
    586586    case GST_QUERY_URI: {
    587         GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     587        WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    588588        gst_query_set_uri(query, src->priv->uri);
    589589        result = TRUE;
    … …  
    635635    gchar* ret;
    636636
    637     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     637    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    638638    ret = g_strdup(src->priv->uri);
    639639    return ret;
    … …  
    650650    }
    651651
    652     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     652    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    653653
    654654    g_free(priv->uri);
    … …  
    686686    ASSERT(isMainThread());
    687687
    688     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     688    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    689689    priv->paused = FALSE;
    690690    locker.unlock();
    … …  
    703703    GST_DEBUG_OBJECT(src, "Need more data: %u", length);
    704704
    705     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     705    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    706706    if (priv->needDataSource.isScheduled() || !priv->paused)
    707707        return;
    … …  
    718718    ASSERT(isMainThread());
    719719
    720     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     720    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    721721    priv->paused = TRUE;
    722722    locker.unlock();
    … …  
    735735    GST_DEBUG_OBJECT(src, "Have enough data");
    736736
    737     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     737    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    738738    if (priv->enoughDataSource.isScheduled() || priv->paused)
    739739        return;
    … …  
    758758
    759759    GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
    760     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     760    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    761761    if (offset == priv->offset && priv->requestedOffset == priv->offset)
    762762        return TRUE;
    … …  
    777777{
    778778    ASSERT(player);
    779     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     779    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    780780    src->priv->player = player;
    781781}
    … …  
    807807    mapGstBuffer(buffer);
    808808
    809     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     809    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    810810    priv->buffer = adoptGRef(buffer);
    811811    locker.unlock();
    … …  
    829829    }
    830830
    831     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     831    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    832832
    833833    if (priv->seekSource.isActive()) {
    … …  
    926926    WebKitWebSrcPrivate* priv = src->priv;
    927927
    928     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     928    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    929929
    930930    GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
    … …  
    995995    GST_DEBUG_OBJECT(src, "Have EOS");
    996996
    997     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     997    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    998998    if (!priv->seekSource.isActive()) {
    999999        locker.unlock();
    … …  
    11321132    GST_ERROR_OBJECT(src, "Request was blocked");
    11331133
    1134     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     1134    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    11351135    uri.reset(g_strdup(src->priv->uri));
    11361136    locker.unlock();
    … …  
    11461146    GST_ERROR_OBJECT(src, "Cannot show URL");
    11471147
    1148     GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
     1148    WTF::GMutexLocker<GMutex> locker(*GST_OBJECT_GET_LOCK(src));
    11491149    uri.reset(g_strdup(src->priv->uri));
    11501150    locker.unlock();
Note: See TracChangeset for help on using the changeset viewer.