<!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>[190852] trunk/Source/WebCore</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/190852">190852</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-10-12 04:24:40 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, followup to <a href="http://trac.webkit.org/projects/webkit/changeset/190643">r190643</a>.
Inline the std::function<> constructor wrappings around lambdas
into a single line, instead of spanning it across four lines.
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
(WebCore::InbandTextTrackPrivateGStreamer::handleSample):
(WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
(WebCore::InbandTextTrackPrivateGStreamer::notifyTrackOfSample):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::videoChanged):
(WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
(WebCore::MediaPlayerPrivateGStreamer::audioChanged):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
(WebCore::MediaPlayerPrivateGStreamer::textChanged):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
(WebCore::MediaPlayerPrivateGStreamerBase::networkState):
(WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::activeChanged):
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(webkitVideoSinkRender):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcChangeState):
(webKitWebSrcNeedDataCb):
(webKitWebSrcEnoughDataMainCb):
(webKitWebSrcEnoughDataCb):
(webKitWebSrcSeekMainCb):
(webKitWebSrcSeekDataCb):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/ChangeLog 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-10-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed, followup to r190643.
+
+ Inline the std::function<> constructor wrappings around lambdas
+ into a single line, instead of spanning it across four lines.
+
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp:
+ (WebCore::InbandTextTrackPrivateGStreamer::handleSample):
+ (WebCore::InbandTextTrackPrivateGStreamer::streamChanged):
+ (WebCore::InbandTextTrackPrivateGStreamer::notifyTrackOfSample):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::videoChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::videoCapsChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
+ (WebCore::MediaPlayerPrivateGStreamer::audioChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
+ (WebCore::MediaPlayerPrivateGStreamer::textChanged):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::volumeChanged):
+ (WebCore::MediaPlayerPrivateGStreamerBase::networkState):
+ (WebCore::MediaPlayerPrivateGStreamerBase::muteChanged):
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::activeChanged):
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (webkitVideoSinkRender):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcChangeState):
+ (webKitWebSrcNeedDataCb):
+ (webKitWebSrcEnoughDataMainCb):
+ (webKitWebSrcEnoughDataCb):
+ (webKitWebSrcSeekMainCb):
+ (webKitWebSrcSeekDataCb):
+
</ins><span class="cx"> 2015-10-11 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Add missing builtins files to the Xcode projects
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -83,20 +83,14 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
</span><span class="cx"> m_sampleTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfSample",
</span><del>- std::function<void()>(
- [protector] {
- protector->notifyTrackOfSample();
- }));
</del><ins>+ std::function<void()>([protector] { protector->notifyTrackOfSample(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::streamChanged()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InbandTextTrackPrivateGStreamer> protector(this);
</span><span class="cx"> m_streamTimerHandler.schedule("[WebKit] InbandTextTrackPrivateGStreamer::notifyTrackOfStreamChanged",
</span><del>- std::function<void()>(
- [protector] {
- protector->notifyTrackOfStreamChanged();
- }));
</del><ins>+ std::function<void()>([protector] { protector->notifyTrackOfStreamChanged(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandTextTrackPrivateGStreamer::notifyTrackOfSample()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -651,19 +651,13 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::videoChanged()
</span><span class="cx"> {
</span><span class="cx"> m_videoTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfVideo();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfVideo(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::videoCapsChanged()
</span><span class="cx"> {
</span><span class="cx"> m_videoCapsTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::videoCapsChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfVideoCaps();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfVideoCaps(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
</span><span class="lines">@@ -712,10 +706,7 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::audioChanged()
</span><span class="cx"> {
</span><span class="cx"> m_audioTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::audioChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfAudio();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfAudio(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
</span><span class="lines">@@ -759,10 +750,7 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::textChanged()
</span><span class="cx"> {
</span><span class="cx"> m_textTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamer::textChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfText();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfText(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::notifyPlayerOfText()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -362,10 +362,7 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::volumeChanged()
</span><span class="cx"> {
</span><span class="cx"> m_volumeTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::volumeChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfVolumeChange();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfVolumeChange(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayer::NetworkState MediaPlayerPrivateGStreamerBase::networkState() const
</span><span class="lines">@@ -414,10 +411,7 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::muteChanged()
</span><span class="cx"> {
</span><span class="cx"> m_muteTimerHandler.schedule("[WebKit] MediaPlayerPrivateGStreamerBase::muteChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyPlayerOfMute();
- }));
</del><ins>+ std::function<void()>([this] { notifyPlayerOfMute(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -93,10 +93,7 @@
</span><span class="cx"> void TrackPrivateBaseGStreamer::activeChanged()
</span><span class="cx"> {
</span><span class="cx"> m_activeTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyTrackOfActiveChanged();
- }));
</del><ins>+ std::function<void()>([this] { notifyTrackOfActiveChanged(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::tagsChanged()
</span><span class="lines">@@ -111,10 +108,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_tagTimerHandler.schedule("[WebKit] TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged",
</span><del>- std::function<void()>(
- [this] {
- notifyTrackOfTagsChanged();
- }));
</del><ins>+ std::function<void()>([this] { notifyTrackOfTagsChanged(); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -219,10 +219,7 @@
</span><span class="cx"> // See: https://bugzilla.gnome.org/show_bug.cgi?id=610830.
</span><span class="cx"> GRefPtr<WebKitVideoSink> protector(sink);
</span><span class="cx"> priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback",
</span><del>- std::function<void()>(
- [protector] {
- webkitVideoSinkTimeoutCallback(protector.get());
- }));
</del><ins>+ std::function<void()>([protector] { webkitVideoSinkTimeoutCallback(protector.get()); }));
</ins><span class="cx">
</span><span class="cx"> g_cond_wait(&priv->dataCondition, &priv->sampleMutex);
</span><span class="cx"> return GST_FLOW_OK;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (190851 => 190852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-12 07:52:53 UTC (rev 190851)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-10-12 11:24:40 UTC (rev 190852)
</span><span class="lines">@@ -666,10 +666,7 @@
</span><span class="cx"> priv->pendingStart = TRUE;
</span><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><span class="cx"> priv->startSource.schedule("[WebKit] webKitWebSrcStart",
</span><del>- std::function<void()>(
- [protector] {
- webKitWebSrcStart(protector.get());
- }));
</del><ins>+ std::function<void()>([protector] { webKitWebSrcStart(protector.get()); }));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GST_STATE_CHANGE_PAUSED_TO_READY:
</span><span class="lines">@@ -680,10 +677,7 @@
</span><span class="cx"> removeTimeoutSources(src);
</span><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><span class="cx"> priv->stopSource.schedule("[WebKit] webKitWebSrcStop",
</span><del>- std::function<void()>(
- [protector] {
- webKitWebSrcStop(protector.get());
- }));
</del><ins>+ std::function<void()>([protector] { webKitWebSrcStop(protector.get()); }));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -839,10 +833,7 @@
</span><span class="cx">
</span><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><span class="cx"> priv->needDataSource.schedule("[WebKit] webKitWebSrcNeedDataMainCb",
</span><del>- std::function<void()>(
- [protector] {
- webKitWebSrcNeedDataMainCb(protector.get());
- }));
</del><ins>+ std::function<void()>([protector] { webKitWebSrcNeedDataMainCb(protector.get()); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
</span><span class="lines">@@ -874,10 +865,7 @@
</span><span class="cx">
</span><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><span class="cx"> priv->enoughDataSource.schedule("[WebKit] webKitWebSrcEnoughDataMainCb",
</span><del>- std::function<void()>(
- [protector] {
- webKitWebSrcEnoughDataMainCb(protector.get());
- }));
</del><ins>+ std::function<void()>([protector] { webKitWebSrcEnoughDataMainCb(protector.get()); }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webKitWebSrcSeekMainCb(WebKitWebSrc* src)
</span><span class="lines">@@ -906,10 +894,7 @@
</span><span class="cx">
</span><span class="cx"> GRefPtr<WebKitWebSrc> protector(src);
</span><span class="cx"> priv->seekSource.schedule("[WebKit] webKitWebSrcSeekMainCb",
</span><del>- std::function<void()>(
- [protector] {
- webKitWebSrcSeekMainCb(WEBKIT_WEB_SRC(protector.get()));
- }));
</del><ins>+ std::function<void()>([protector] { webKitWebSrcSeekMainCb(WEBKIT_WEB_SRC(protector.get())); }));
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>