Changeset 166643 in webkit


Ignore:
Timestamp:
Apr 2, 2014 7:27:43 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[WinCairo] Build fix after r166496.
https://bugs.webkit.org/show_bug.cgi?id=131006

Patch by Alex Christensen <achristensen@webkit.org> on 2014-04-02
Reviewed by Carlos Garcia Campos.

  • platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:

(WebCore::InbandTextTrackPrivateGStreamer::handleSample):
(WebCore::InbandTextTrackPrivateGStreamer::streamChanged):

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
(WebCore::MediaPlayerPrivateGStreamer::videoChanged):
(WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
(WebCore::MediaPlayerPrivateGStreamer::audioChanged):
(WebCore::MediaPlayerPrivateGStreamer::textChanged):

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
(WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):

  • platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:

(WebCore::TrackPrivateBaseGStreamer::activeChanged):
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):

  • platform/graphics/gstreamer/VideoSinkGStreamer.cpp:

(webkitVideoSinkRender):

  • platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:

(webKitWebSrcChangeState):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekDataCb):
Added std::function<void()> constructors to help Visual Studio decide which version of
GMainLoopSource::schedule or GMainLoopSource::scheduleAfterDelay to use.

Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r166642 r166643  
     12014-04-02  Alex Christensen  <achristensen@webkit.org>
     2
     3        [WinCairo] Build fix after r166496.
     4        https://bugs.webkit.org/show_bug.cgi?id=131006
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
     9        (WebCore::InbandTextTrackPrivateGStreamer::handleSample):
     10        (WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
     11        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
     12        (WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
     13        (WebCore::MediaPlayerPrivateGStreamer::videoChanged):
     14        (WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
     15        (WebCore::MediaPlayerPrivateGStreamer::audioChanged):
     16        (WebCore::MediaPlayerPrivateGStreamer::textChanged):
     17        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
     18        (WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
     19        (WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):
     20        * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
     21        (WebCore::TrackPrivateBaseGStreamer::activeChanged):
     22        (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
     23        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
     24        (webkitVideoSinkRender):
     25        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
     26        (webKitWebSrcChangeState):
     27        (webKitWebSrcNeedDataCb):
     28        (webKitWebSrcEnoughDataCb):
     29        (webKitWebSrcSeekDataCb):
     30        Added std::function<void()> constructors to help Visual Studio decide which version of
     31        GMainLoopSource::schedule or GMainLoopSource::scheduleAfterDelay to use.
     32
    1332014-04-02  Zalan Bujtas  <zalan@apple.com>
    234
  • trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp

    r166496 r166643  
    8181        m_pendingSamples.append(sample);
    8282    }
    83     m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample", std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfSample, this));
     83    m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfSample, this)));
    8484}
    8585
    8686void InbandTextTrackPrivateGStreamer::streamChanged()
    8787{
    88     m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged", std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged, this));
     88    m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged", std::function<void()>(std::bind(&InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged, this)));
    8989}
    9090
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

    r166496 r166643  
    391391    // See also https://bugs.webkit.org/show_bug.cgi?id=117354
    392392    if (newState == GST_STATE_READY && !m_readyTimerHandler.isScheduled()) {
    393         m_readyTimerHandler.scheduleAfterDelay("[WebKit] mediaPlayerPrivateReadyStateTimeoutCallback", [this] { changePipelineState(GST_STATE_NULL); },
     393        m_readyTimerHandler.scheduleAfterDelay("[WebKit] mediaPlayerPrivateReadyStateTimeoutCallback", std::function<void()>([this] { changePipelineState(GST_STATE_NULL); }),
    394394            std::chrono::seconds(gReadyStateTimerInterval));
    395395    } else if (newState != GST_STATE_READY && m_readyTimerHandler.isScheduled()) {
     
    615615void MediaPlayerPrivateGStreamer::videoChanged()
    616616{
    617     m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged", std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideo, this));
     617    m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideo, this)));
    618618}
    619619
    620620void MediaPlayerPrivateGStreamer::videoCapsChanged()
    621621{
    622     m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged", std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps, this));
     622    m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps, this)));
    623623}
    624624
     
    668668void MediaPlayerPrivateGStreamer::audioChanged()
    669669{
    670     m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged", std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfAudio, this));
     670    m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfAudio, this)));
    671671}
    672672
     
    711711void MediaPlayerPrivateGStreamer::textChanged()
    712712{
    713     m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged", std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfText, this));
     713    m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamer::notifyPlayerOfText, this)));
    714714}
    715715
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r166496 r166643  
    223223void MediaPlayerPrivateGStreamerBase::volumeChanged()
    224224{
    225     m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged", std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfVolumeChange, this));
     225    m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfVolumeChange, this)));
    226226}
    227227
     
    271271void MediaPlayerPrivateGStreamerBase::muteChanged()
    272272{
    273     m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged", std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute, this));
     273    m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged", std::function<void()>(std::bind(&MediaPlayerPrivateGStreamerBase::notifyPlayerOfMute, this)));
    274274}
    275275
  • trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp

    r166496 r166643  
    9393void TrackPrivateBaseGStreamer::activeChanged()
    9494{
    95     m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged", std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged, this));
     95    m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged, this)));
    9696}
    9797
     
    107107    }
    108108
    109     m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged", std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged, this));
     109    m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged", std::function<void()>(std::bind(&TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged, this)));
    110110}
    111111
  • trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

    r166496 r166643  
    216216    // See: https://bugzilla.gnome.org/show_bug.cgi?id=610830.
    217217    gst_object_ref(sink);
    218     priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::bind(webkitVideoSinkTimeoutCallback, sink), G_PRIORITY_DEFAULT,
     218    priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::function<void()>(std::bind(webkitVideoSinkTimeoutCallback, sink)), G_PRIORITY_DEFAULT,
    219219        [sink] { gst_object_unref(sink); });
    220220
  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r166496 r166643  
    533533        GST_DEBUG_OBJECT(src, "READY->PAUSED");
    534534        gst_object_ref(src);
    535         priv->startSource.schedule("[WebKit] webKitWebSrcStart", std::bind(webKitWebSrcStart, src), G_PRIORITY_DEFAULT,
     535        priv->startSource.schedule("[WebKit] webKitWebSrcStart", std::function<void()>(std::bind(webKitWebSrcStart, src)), G_PRIORITY_DEFAULT,
    536536            [src] { gst_object_unref(src); });
    537537        break;
     
    541541        removeTimeoutSources(src);
    542542        gst_object_ref(src);
    543         priv->stopSource.schedule("[WebKit] webKitWebSrcStop", std::bind(webKitWebSrcStop, src), G_PRIORITY_DEFAULT,
     543        priv->stopSource.schedule("[WebKit] webKitWebSrcStop", std::function<void()>(std::bind(webKitWebSrcStop, src)), G_PRIORITY_DEFAULT,
    544544            [src] { gst_object_unref(src); });
    545545        break;
     
    683683
    684684    gst_object_ref(src);
    685     priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb", std::bind(webKitWebSrcNeedDataMainCb, src), G_PRIORITY_DEFAULT,
     685    priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb", std::function<void()>(std::bind(webKitWebSrcNeedDataMainCb, src)), G_PRIORITY_DEFAULT,
    686686        [src] { gst_object_unref(src); });
    687687}
     
    713713
    714714    gst_object_ref(src);
    715     priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb", std::bind(webKitWebSrcEnoughDataMainCb, src), G_PRIORITY_DEFAULT,
     715    priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb", std::function<void()>(std::bind(webKitWebSrcEnoughDataMainCb, src)), G_PRIORITY_DEFAULT,
    716716        [src] { gst_object_unref(src); });
    717717}
     
    742742
    743743    gst_object_ref(src);
    744     priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb", std::bind(webKitWebSrcSeekMainCb, src), G_PRIORITY_DEFAULT,
     744    priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb", std::function<void()>(std::bind(webKitWebSrcSeekMainCb, src)), G_PRIORITY_DEFAULT,
    745745        [src] { gst_object_unref(src); });
    746746    return TRUE;
Note: See TracChangeset for help on using the changeset viewer.