Changeset 166643 in webkit
- Timestamp:
- Apr 2, 2014 7:27:43 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r166642 r166643 1 2014-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 1 33 2014-04-02 Zalan Bujtas <zalan@apple.com> 2 34 -
trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp
r166496 r166643 81 81 m_pendingSamples.append(sample); 82 82 } 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))); 84 84 } 85 85 86 86 void InbandTextTrackPrivateGStreamer::streamChanged() 87 87 { 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))); 89 89 } 90 90 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
r166496 r166643 391 391 // See also https://bugs.webkit.org/show_bug.cgi?id=117354 392 392 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); }), 394 394 std::chrono::seconds(gReadyStateTimerInterval)); 395 395 } else if (newState != GST_STATE_READY && m_readyTimerHandler.isScheduled()) { … … 615 615 void MediaPlayerPrivateGStreamer::videoChanged() 616 616 { 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))); 618 618 } 619 619 620 620 void MediaPlayerPrivateGStreamer::videoCapsChanged() 621 621 { 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))); 623 623 } 624 624 … … 668 668 void MediaPlayerPrivateGStreamer::audioChanged() 669 669 { 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))); 671 671 } 672 672 … … 711 711 void MediaPlayerPrivateGStreamer::textChanged() 712 712 { 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))); 714 714 } 715 715 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
r166496 r166643 223 223 void MediaPlayerPrivateGStreamerBase::volumeChanged() 224 224 { 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))); 226 226 } 227 227 … … 271 271 void MediaPlayerPrivateGStreamerBase::muteChanged() 272 272 { 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))); 274 274 } 275 275 -
trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp
r166496 r166643 93 93 void TrackPrivateBaseGStreamer::activeChanged() 94 94 { 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))); 96 96 } 97 97 … … 107 107 } 108 108 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))); 110 110 } 111 111 -
trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
r166496 r166643 216 216 // See: https://bugzilla.gnome.org/show_bug.cgi?id=610830. 217 217 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, 219 219 [sink] { gst_object_unref(sink); }); 220 220 -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r166496 r166643 533 533 GST_DEBUG_OBJECT(src, "READY->PAUSED"); 534 534 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, 536 536 [src] { gst_object_unref(src); }); 537 537 break; … … 541 541 removeTimeoutSources(src); 542 542 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, 544 544 [src] { gst_object_unref(src); }); 545 545 break; … … 683 683 684 684 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, 686 686 [src] { gst_object_unref(src); }); 687 687 } … … 713 713 714 714 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, 716 716 [src] { gst_object_unref(src); }); 717 717 } … … 742 742 743 743 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, 745 745 [src] { gst_object_unref(src); }); 746 746 return TRUE;
Note: See TracChangeset
for help on using the changeset viewer.