<!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>[191880] trunk</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/191880">191880</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-02 01:15:39 -0800 (Mon, 02 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GLIB] Remove delete on destroy GMainLoopSources
https://bugs.webkit.org/show_bug.cgi?id=150771

Reviewed by Žan Doberšek.

Source/WTF:

Delete on destroy sources made the GMainLoopSource implementation
more complex and they are currently unused.

* wtf/glib/GMainLoopSource.cpp:
(WTF::GMainLoopSource::boolCallback):
(WTF::GMainLoopSource::create): Deleted.
(WTF::GMainLoopSource::GMainLoopSource): Deleted.
(WTF::GMainLoopSource::cancel): Deleted.
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted.
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted.
(WTF::GMainLoopSource::voidCallback): Deleted.
* wtf/glib/GMainLoopSource.h:

Tools:

* TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp:
(TestWebKitAPI::TEST): Remove DeleteOnDestroy unit tests.
* TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
(WebViewTest::wait): Use g_timeout_add instead of GMainLoopSource.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfglibGMainLoopSourcecpp">trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibGMainLoopSourceh">trunk/Source/WTF/wtf/glib/GMainLoopSource.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFglibGMainLoopSourcecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Source/WTF/ChangeLog        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-02  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GLIB] Remove delete on destroy GMainLoopSources
+        https://bugs.webkit.org/show_bug.cgi?id=150771
+
+        Reviewed by Žan Doberšek.
+
+        Delete on destroy sources made the GMainLoopSource implementation
+        more complex and they are currently unused.
+
+        * wtf/glib/GMainLoopSource.cpp:
+        (WTF::GMainLoopSource::boolCallback):
+        (WTF::GMainLoopSource::create): Deleted.
+        (WTF::GMainLoopSource::GMainLoopSource): Deleted.
+        (WTF::GMainLoopSource::cancel): Deleted.
+        (WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted.
+        (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted.
+        (WTF::GMainLoopSource::voidCallback): Deleted.
+        * wtf/glib/GMainLoopSource.h:
+
</ins><span class="cx"> 2015-11-01  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Use RunLoop in WorkQueue implementation
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibGMainLoopSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -32,23 +32,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WTF {
</span><span class="cx"> 
</span><del>-GMainLoopSource&amp; GMainLoopSource::create()
-{
-    return *new GMainLoopSource(DeleteOnDestroy);
-}
-
-GMainLoopSource::GMainLoopSource()
-    : m_deleteOnDestroy(DoNotDeleteOnDestroy)
-    , m_status(Ready)
-{
-}
-
-GMainLoopSource::GMainLoopSource(DeleteOnDestroyType deleteOnDestroy)
-    : m_deleteOnDestroy(deleteOnDestroy)
-    , m_status(Ready)
-{
-}
-
</del><span class="cx"> GMainLoopSource::~GMainLoopSource()
</span><span class="cx"> {
</span><span class="cx">     cancel();
</span><span class="lines">@@ -66,10 +49,6 @@
</span><span class="cx"> 
</span><span class="cx"> void GMainLoopSource::cancel()
</span><span class="cx"> {
</span><del>-    // Delete-on-destroy GMainLoopSource objects can't be cancelled.
-    if (m_deleteOnDestroy == DeleteOnDestroy)
-        return;
-
</del><span class="cx">     // A valid context should only be present if GMainLoopSource is in the Scheduled or Dispatching state.
</span><span class="cx">     ASSERT(!m_context.source || m_status == Scheduled || m_status == Dispatching);
</span><span class="cx"> 
</span><span class="lines">@@ -297,46 +276,6 @@
</span><span class="cx">     scheduleTimeoutSource(name, reinterpret_cast&lt;GSourceFunc&gt;(boolSourceCallback), priority, context);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GMainLoopSource::scheduleAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp; function, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().schedule(name, WTF::move(function), priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp; function, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().schedule(name, WTF::move(function), priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp; function, std::chrono::milliseconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp; function, std::chrono::milliseconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp; function, std::chrono::seconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp; function, std::chrono::seconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp; function, std::chrono::microseconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
-void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp; function, std::chrono::microseconds delay, int priority, std::function&lt;void()&gt;&amp;&amp; destroyFunction, GMainContext* context)
-{
-    create().scheduleAfterDelay(name, WTF::move(function), delay, priority, WTF::move(destroyFunction), context);
-}
-
</del><span class="cx"> bool GMainLoopSource::prepareVoidCallback(Context&amp; context)
</span><span class="cx"> {
</span><span class="cx">     if (!m_context.source)
</span><span class="lines">@@ -369,8 +308,6 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     context.destroySource();
</span><del>-    if (m_deleteOnDestroy == DeleteOnDestroy)
-        delete this;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool GMainLoopSource::prepareBoolCallback(Context&amp; context)
</span><span class="lines">@@ -408,11 +345,8 @@
</span><span class="cx">         finishBoolCallback(retval, context);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (context.source) {
</del><ins>+    if (context.source)
</ins><span class="cx">         context.destroySource();
</span><del>-        if (m_deleteOnDestroy == DeleteOnDestroy)
-            delete this;
-    }
</del><span class="cx"> 
</span><span class="cx">     return retval;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibGMainLoopSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/GMainLoopSource.h (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GMainLoopSource.h        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Source/WTF/wtf/glib/GMainLoopSource.h        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(GMainLoopSource);
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    WTF_EXPORT_PRIVATE GMainLoopSource();
</del><ins>+    WTF_EXPORT_PRIVATE GMainLoopSource() = default;
</ins><span class="cx">     WTF_EXPORT_PRIVATE virtual ~GMainLoopSource();
</span><span class="cx"> 
</span><span class="cx">     static const bool Stop = false;
</span><span class="lines">@@ -62,15 +62,6 @@
</span><span class="cx"> 
</span><span class="cx">     WTF_EXPORT_PRIVATE void schedule(const char* name, std::function&lt;bool(GIOCondition)&gt;&amp;&amp;, GSocket*, GIOCondition, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="cx"> 
</span><del>-    static void scheduleAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp;, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp;, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp;, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp;, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp;, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp;, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;void()&gt;&amp;&amp;, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-    static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function&lt;bool()&gt;&amp;&amp;, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function&lt;void()&gt;&amp;&amp; destroyFunction = nullptr, GMainContext* = nullptr);
-
</del><span class="cx"> protected:
</span><span class="cx">     enum Status { Ready, Scheduled, Dispatching };
</span><span class="cx"> 
</span><span class="lines">@@ -108,11 +99,6 @@
</span><span class="cx">     virtual void finishBoolCallback(bool retval, Context&amp;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    static GMainLoopSource&amp; create();
-
-    enum DeleteOnDestroyType { DeleteOnDestroy, DoNotDeleteOnDestroy };
-    GMainLoopSource(DeleteOnDestroyType);
-
</del><span class="cx">     void scheduleIdleSource(const char* name, GSourceFunc, int priority, GMainContext*);
</span><span class="cx">     void scheduleTimeoutSource(const char* name, GSourceFunc, int priority, GMainContext*);
</span><span class="cx">     bool socketCallback(GIOCondition);
</span><span class="lines">@@ -121,11 +107,9 @@
</span><span class="cx">     static gboolean boolSourceCallback(GMainLoopSource*);
</span><span class="cx">     static gboolean socketSourceCallback(GSocket*, GIOCondition, GMainLoopSource*);
</span><span class="cx"> 
</span><del>-    DeleteOnDestroyType m_deleteOnDestroy;
-
</del><span class="cx"> protected:
</span><span class="cx">     Context m_context;
</span><del>-    Status m_status;
</del><ins>+    Status m_status { Ready };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Tools/ChangeLog        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-02  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GLIB] Remove delete on destroy GMainLoopSources
+        https://bugs.webkit.org/show_bug.cgi?id=150771
+
+        Reviewed by Žan Doberšek.
+
+        * TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp:
+        (TestWebKitAPI::TEST): Remove DeleteOnDestroy unit tests.
+        * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
+        (WebViewTest::wait): Use g_timeout_add instead of GMainLoopSource.
+
</ins><span class="cx"> 2015-11-01  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ES6] Support Generator Syntax
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFglibGMainLoopSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -494,54 +494,4 @@
</span><span class="cx">     destroyCallbacksAfterReschedulingDuringDispatch&lt;ThreadSafeTestingContext&gt;();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TEST(WTF_GMainLoopSource, DeleteOnDestroySources)
-{
-    // Testing the delete-on-destroy sources is very limited. There's no good way
-    // of testing that the GMainLoopSource objects are deleted when their GSource
-    // is destroyed.
-
-    struct TestingContext {
-        GMainLoopSourceTest&lt;GMainLoopSource&gt; test;
-        unsigned callbackCallCount = 0;
-        bool destroyCallbackCalled = false;
-    } context;
-
-    {
-        TestingContext context;
-
-        GMainLoopSource::scheduleAndDeleteOnDestroy(&quot;[Test] DeleteOnDestroy&quot;,
-            [&amp;] {
-                context.callbackCallCount++;
-            }, G_PRIORITY_DEFAULT,
-            [&amp;] {
-                EXPECT_FALSE(context.destroyCallbackCalled);
-                context.destroyCallbackCalled = true;
-            });
-
-        context.test.delayedFinish();
-        context.test.runLoop();
-        EXPECT_EQ(1, context.callbackCallCount);
-        EXPECT_TRUE(context.destroyCallbackCalled);
-    }
-
-    {
-        TestingContext context;
-
-        GMainLoopSource::scheduleAndDeleteOnDestroy(&quot;[Test] DeleteOnDestroy&quot;,
-            std::function&lt;bool ()&gt;([&amp;] {
-                context.callbackCallCount++;
-                return context.callbackCallCount != 3;
-            }), G_PRIORITY_DEFAULT,
-            [&amp;] {
-                EXPECT_FALSE(context.destroyCallbackCalled);
-                context.destroyCallbackCalled = true;
-            });
-
-        context.test.delayedFinish();
-        context.test.runLoop();
-        EXPECT_EQ(3, context.callbackCallCount);
-        EXPECT_TRUE(context.destroyCallbackCalled);
-    }
-}
-
</del><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp (191879 => 191880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp        2015-11-02 09:02:50 UTC (rev 191879)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp        2015-11-02 09:15:39 UTC (rev 191880)
</span><span class="lines">@@ -182,8 +182,10 @@
</span><span class="cx"> 
</span><span class="cx"> void WebViewTest::wait(double seconds)
</span><span class="cx"> {
</span><del>-    GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(&quot;WebViewTest wait&quot;, [this] { quitMainLoop(); },
-        std::chrono::duration_cast&lt;std::chrono::milliseconds&gt;(std::chrono::duration&lt;double&gt;(seconds)));
</del><ins>+    g_timeout_add(seconds * 1000, [](gpointer userData) -&gt; gboolean {
+        static_cast&lt;WebViewTest*&gt;(userData)-&gt;quitMainLoop();
+        return G_SOURCE_REMOVE;
+    }, this);
</ins><span class="cx">     g_main_loop_run(m_mainLoop);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>