<!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>[166916] 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/166916">166916</a></dd>
<dt>Author</dt> <dd>agomez@igalia.com</dd>
<dt>Date</dt> <dd>2014-04-08 00:37:37 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [EFL] Build fails with GCC < 4.8.x
https://bugs.webkit.org/show_bug.cgi?id=130585
Reviewed by Martin Robinson.
The behavior in lower versions of GCC seem to be related to
http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2132.
Provided explicit casts for the failing ambiguous overloads.
Source/WebCore:
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::AudioFileReader::createBus):
* platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcChangeState):
(webKitMediaVideoSrcNeedDataCb):
(webKitMediaAudioSrcNeedDataCb):
(webKitMediaVideoSrcEnoughDataCb):
(webKitMediaAudioSrcEnoughDataCb):
(webKitMediaVideoSrcSeekDataCb):
(webKitMediaAudioSrcSeekDataCb):
* platform/gtk/GtkDragAndDropHelper.cpp:
(WebCore::GtkDragAndDropHelper::handleDragLeave):
* platform/gtk/SharedTimerGtk.cpp:
(WebCore::setSharedTimerFireInterval):
Source/WTF:
* wtf/gtk/MainThreadGtk.cpp:
(WTF::scheduleDispatchFunctionsOnMainThread):
* wtf/gtk/RunLoopGtk.cpp:
(WTF::RunLoop::wakeUp): Provided lambda with a RefPtr instead of
ref and de-referring.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfgtkMainThreadGtkcpp">trunk/Source/WTF/wtf/gtk/MainThreadGtk.cpp</a></li>
<li><a href="#trunkSourceWTFwtfgtkRunLoopGtkcpp">trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitMediaSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkDragAndDropHelpercpp">trunk/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSharedTimerGtkcpp">trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WTF/ChangeLog 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-08 Andres Gomez <agomez@igalia.com>
+
+ [GTK] [EFL] Build fails with GCC < 4.8.x
+ https://bugs.webkit.org/show_bug.cgi?id=130585
+
+ Reviewed by Martin Robinson.
+
+ The behavior in lower versions of GCC seem to be related to
+ http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2132.
+
+ Provided explicit casts for the failing ambiguous overloads.
+
+ * wtf/gtk/MainThreadGtk.cpp:
+ (WTF::scheduleDispatchFunctionsOnMainThread):
+ * wtf/gtk/RunLoopGtk.cpp:
+ (WTF::RunLoop::wakeUp): Provided lambda with a RefPtr instead of
+ ref and de-referring.
+
</ins><span class="cx"> 2014-04-04 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Date object needs to check for ES5 15.9.1.14 TimeClip limit.
</span></span></pre></div>
<a id="trunkSourceWTFwtfgtkMainThreadGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gtk/MainThreadGtk.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gtk/MainThreadGtk.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WTF/wtf/gtk/MainThreadGtk.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> void scheduleDispatchFunctionsOnMainThread()
</span><span class="cx"> {
</span><del>- GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", dispatchFunctionsFromMainThread);
</del><ins>+ GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", std::function<void()>(dispatchFunctionsFromMainThread));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfgtkRunLoopGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -99,9 +99,10 @@
</span><span class="cx">
</span><span class="cx"> void RunLoop::wakeUp()
</span><span class="cx"> {
</span><del>- ref();
- GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", std::bind(&RunLoop::performWork, this),
- G_PRIORITY_DEFAULT, [this] { deref(); });
</del><ins>+ RefPtr<RunLoop> runLoop(this);
+ GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", std::function<void()>([runLoop] {
+ runLoop->performWork();
+ }));
</ins><span class="cx"> g_main_context_wakeup(m_runLoopContext.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-04-08 Andres Gomez <agomez@igalia.com>
+
+ [GTK] [EFL] Build fails with GCC < 4.8.x
+ https://bugs.webkit.org/show_bug.cgi?id=130585
+
+ Reviewed by Martin Robinson.
+
+ The behavior in lower versions of GCC seem to be related to
+ http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2132.
+
+ Provided explicit casts for the failing ambiguous overloads.
+
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::AudioFileReader::createBus):
+ * platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
+ (webKitMediaSrcChangeState):
+ (webKitMediaVideoSrcNeedDataCb):
+ (webKitMediaAudioSrcNeedDataCb):
+ (webKitMediaVideoSrcEnoughDataCb):
+ (webKitMediaAudioSrcEnoughDataCb):
+ (webKitMediaVideoSrcSeekDataCb):
+ (webKitMediaAudioSrcSeekDataCb):
+ * platform/gtk/GtkDragAndDropHelper.cpp:
+ (WebCore::GtkDragAndDropHelper::handleDragLeave):
+ * platform/gtk/SharedTimerGtk.cpp:
+ (WebCore::setSharedTimerFireInterval):
+
</ins><span class="cx"> 2014-04-08 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Change NavigatorContentUtils client ownership from port side to NavigatorContentUtils
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> // Start the pipeline processing just after the loop is started.
</span><span class="cx"> GMainLoopSource source;
</span><del>- source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", std::bind(&AudioFileReader::decodeAudioForBusCreation, this), G_PRIORITY_DEFAULT, nullptr, context.get());
</del><ins>+ source.schedule("[WebKit] AudioFileReader::decodeAudioForBusCreation", std::function<void()>(std::bind(&AudioFileReader::decodeAudioForBusCreation, this)), G_PRIORITY_DEFAULT, nullptr, context.get());
</ins><span class="cx">
</span><span class="cx"> g_main_loop_run(m_loop.get());
</span><span class="cx"> g_main_context_pop_thread_default(context.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -366,11 +366,11 @@
</span><span class="cx"> GST_OBJECT_LOCK(src);
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceVideo.start.schedule("[WebKit] webKitMediaVideoSrcStart", std::bind(webKitMediaVideoSrcStart, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceVideo.start.schedule("[WebKit] webKitMediaVideoSrcStart", std::function<void()>(std::bind(webKitMediaVideoSrcStart, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceAudio.start.schedule("[WebKit] webKitMediaAudioSrcStart", std::bind(webKitMediaAudioSrcStart, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceAudio.start.schedule("[WebKit] webKitMediaAudioSrcStart", std::function<void()>(std::bind(webKitMediaAudioSrcStart, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="lines">@@ -380,11 +380,11 @@
</span><span class="cx"> GST_OBJECT_LOCK(src);
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceVideo.stop.schedule("[WebKit] webKitMediaVideoSrcStop", std::bind(webKitMediaVideoSrcStop, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceVideo.stop.schedule("[WebKit] webKitMediaVideoSrcStop", std::function<void()>(std::bind(webKitMediaVideoSrcStop, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceAudio.stop.schedule("[WebKit] webKitMediaAudioSrcStop", std::bind(webKitMediaAudioSrcStop, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceAudio.stop.schedule("[WebKit] webKitMediaAudioSrcStop", std::function<void()>(std::bind(webKitMediaAudioSrcStop, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceVideo.needData.schedule("[WebKit] webKitMediaVideoSrcNeedDataMainCb", std::bind(webKitMediaVideoSrcNeedDataMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceVideo.needData.schedule("[WebKit] webKitMediaVideoSrcNeedDataMainCb", std::function<void()>(std::bind(webKitMediaVideoSrcNeedDataMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="cx"> }
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceAudio.needData.schedule("[WebKit] webKitMediaAudioSrcNeedDataMainCb", std::bind(webKitMediaAudioSrcNeedDataMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceAudio.needData.schedule("[WebKit] webKitMediaAudioSrcNeedDataMainCb", std::function<void()>(std::bind(webKitMediaAudioSrcNeedDataMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="cx"> }
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceVideo.enoughData.schedule("[WebKit] webKitMediaVideoSrcEnoughDataMainCb", std::bind(webKitMediaVideoSrcEnoughDataMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceVideo.enoughData.schedule("[WebKit] webKitMediaVideoSrcEnoughDataMainCb", std::function<void()>(std::bind(webKitMediaVideoSrcEnoughDataMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceAudio.enoughData.schedule("[WebKit] webKitMediaAudioSrcEnoughDataMainCb", std::bind(webKitMediaAudioSrcEnoughDataMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceAudio.enoughData.schedule("[WebKit] webKitMediaAudioSrcEnoughDataMainCb", std::function<void()>(std::bind(webKitMediaAudioSrcEnoughDataMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> priv->sourceVideo.requestedOffset = offset;
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceVideo.seek.schedule("[WebKit] webKitMediaVideoSrcSeekMainCb", std::bind(webKitMediaVideoSrcSeekMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceVideo.seek.schedule("[WebKit] webKitMediaVideoSrcSeekMainCb", std::function<void()>(std::bind(webKitMediaVideoSrcSeekMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> priv->sourceAudio.requestedOffset = offset;
</span><span class="cx">
</span><span class="cx"> gst_object_ref(src);
</span><del>- priv->sourceAudio.seek.schedule("[WebKit] webKitMediaAudioSrcSeekMainCb", std::bind(webKitMediaAudioSrcSeekMainCb, src), G_PRIORITY_DEFAULT,
</del><ins>+ priv->sourceAudio.seek.schedule("[WebKit] webKitMediaAudioSrcSeekMainCb", std::function<void()>(std::bind(webKitMediaAudioSrcSeekMainCb, src)), G_PRIORITY_DEFAULT,
</ins><span class="cx"> [src] { gst_object_unref(src); });
</span><span class="cx">
</span><span class="cx"> GST_OBJECT_UNLOCK(src);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkDragAndDropHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> // the drag-drop signal. We want the actions for drag-leave to happen after
</span><span class="cx"> // those for drag-drop, so schedule them to happen asynchronously here.
</span><span class="cx"> context->exitedCallback = exitedCallback;
</span><del>- GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] handleDragLeaveLater", std::bind(&GtkDragAndDropHelper::handleDragLeaveLater, this, context));
</del><ins>+ GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] handleDragLeaveLater", std::function<void()>(std::bind(&GtkDragAndDropHelper::handleDragLeaveLater, this, context)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void queryNewDropContextData(DroppingContext* dropContext, GtkWidget* widget, guint time)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSharedTimerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp (166915 => 166916)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2014-04-08 07:14:20 UTC (rev 166915)
+++ trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2014-04-08 07:37:37 UTC (rev 166916)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(sharedTimerFiredFunction);
</span><span class="cx">
</span><del>- gSharedTimer.scheduleAfterDelay("[WebKit] sharedTimerTimeoutCallback", sharedTimerFiredFunction,
</del><ins>+ gSharedTimer.scheduleAfterDelay("[WebKit] sharedTimerTimeoutCallback", std::function<void()>(sharedTimerFiredFunction),
</ins><span class="cx"> std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(interval)), GDK_PRIORITY_REDRAW);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>