<!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>[183921] trunk/Source/WTF</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/183921">183921</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-05-07 01:26:56 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Clean up RunLoop implementation
https://bugs.webkit.org/show_bug.cgi?id=144729
Reviewed by Carlos Garcia Campos.
Clean up the RunLoop implementation for the GTK port,
removing unnecessary methods and using simpler variable names.
Nested GMainLoops in RunLoop::run() are now created for the
RunLoop's GMainContext, and not for the default context (enforced
through the null argument to g_main_loop_new()).
* wtf/RunLoop.h:
* wtf/gtk/RunLoopGtk.cpp:
(WTF::RunLoop::RunLoop):
(WTF::RunLoop::~RunLoop):
(WTF::RunLoop::run):
(WTF::RunLoop::stop):
(WTF::RunLoop::wakeUp):
(WTF::RunLoop::TimerBase::start):
(WTF::RunLoop::innermostLoop): Deleted.
(WTF::RunLoop::pushNestedMainLoop): Deleted.
(WTF::RunLoop::popNestedMainLoop): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfgtkRunLoopGtkcpp">trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183920 => 183921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-07 08:09:03 UTC (rev 183920)
+++ trunk/Source/WTF/ChangeLog 2015-05-07 08:26:56 UTC (rev 183921)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-05-07 Žan Doberšek <zdobersek@igalia.com>
+
+ [GTK] Clean up RunLoop implementation
+ https://bugs.webkit.org/show_bug.cgi?id=144729
+
+ Reviewed by Carlos Garcia Campos.
+
+ Clean up the RunLoop implementation for the GTK port,
+ removing unnecessary methods and using simpler variable names.
+
+ Nested GMainLoops in RunLoop::run() are now created for the
+ RunLoop's GMainContext, and not for the default context (enforced
+ through the null argument to g_main_loop_new()).
+
+ * wtf/RunLoop.h:
+ * wtf/gtk/RunLoopGtk.cpp:
+ (WTF::RunLoop::RunLoop):
+ (WTF::RunLoop::~RunLoop):
+ (WTF::RunLoop::run):
+ (WTF::RunLoop::stop):
+ (WTF::RunLoop::wakeUp):
+ (WTF::RunLoop::TimerBase::start):
+ (WTF::RunLoop::innermostLoop): Deleted.
+ (WTF::RunLoop::pushNestedMainLoop): Deleted.
+ (WTF::RunLoop::popNestedMainLoop): Deleted.
+
</ins><span class="cx"> 2015-05-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Async operations running in the WorkQueue thread should schedule their sources to the WorkQueue main lopp
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (183920 => 183921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2015-05-07 08:09:03 UTC (rev 183920)
+++ trunk/Source/WTF/wtf/RunLoop.h 2015-05-07 08:26:56 UTC (rev 183921)
</span><span class="lines">@@ -157,12 +157,9 @@
</span><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> public:
</span><span class="cx"> static gboolean queueWork(RunLoop*);
</span><del>- GMainLoop* innermostLoop();
- void pushNestedMainLoop(GMainLoop*);
- void popNestedMainLoop();
</del><span class="cx"> private:
</span><del>- GRefPtr<GMainContext> m_runLoopContext;
- Vector<GRefPtr<GMainLoop>> m_runLoopMainLoops;
</del><ins>+ GRefPtr<GMainContext> m_mainContext;
+ Vector<GRefPtr<GMainLoop>> m_mainLoops;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfgtkRunLoopGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp (183920 => 183921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2015-05-07 08:09:03 UTC (rev 183920)
+++ trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2015-05-07 08:26:56 UTC (rev 183921)
</span><span class="lines">@@ -35,64 +35,47 @@
</span><span class="cx"> RunLoop::RunLoop()
</span><span class="cx"> {
</span><span class="cx"> // g_main_context_default() doesn't add an extra reference.
</span><del>- m_runLoopContext = isMainThread() ? g_main_context_default() : adoptGRef(g_main_context_new());
- ASSERT(m_runLoopContext);
- GRefPtr<GMainLoop> innermostLoop = adoptGRef(g_main_loop_new(m_runLoopContext.get(), FALSE));
</del><ins>+ m_mainContext = isMainThread() ? g_main_context_default() : adoptGRef(g_main_context_new());
+ ASSERT(m_mainContext);
+ GRefPtr<GMainLoop> innermostLoop = adoptGRef(g_main_loop_new(m_mainContext.get(), FALSE));
</ins><span class="cx"> ASSERT(innermostLoop);
</span><del>- m_runLoopMainLoops.append(innermostLoop);
</del><ins>+ m_mainLoops.append(innermostLoop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunLoop::~RunLoop()
</span><span class="cx"> {
</span><del>- for (int i = m_runLoopMainLoops.size() - 1; i >= 0; --i) {
- if (!g_main_loop_is_running(m_runLoopMainLoops[i].get()))
</del><ins>+ for (int i = m_mainLoops.size() - 1; i >= 0; --i) {
+ if (!g_main_loop_is_running(m_mainLoops[i].get()))
</ins><span class="cx"> continue;
</span><del>- g_main_loop_quit(m_runLoopMainLoops[i].get());
</del><ins>+ g_main_loop_quit(m_mainLoops[i].get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RunLoop::run()
</span><span class="cx"> {
</span><del>- RunLoop& mainRunLoop = RunLoop::current();
- GMainLoop* innermostLoop = mainRunLoop.innermostLoop();
</del><ins>+ RunLoop& runLoop = RunLoop::current();
+
+ // The innermost main loop should always be there.
+ ASSERT(!runLoop.m_mainLoops.isEmpty());
+
+ GMainLoop* innermostLoop = runLoop.m_mainLoops[0].get();
</ins><span class="cx"> if (!g_main_loop_is_running(innermostLoop)) {
</span><span class="cx"> g_main_loop_run(innermostLoop);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Create and run a nested loop if the innermost one was already running.
</span><del>- GMainLoop* nestedMainLoop = g_main_loop_new(0, FALSE);
- mainRunLoop.pushNestedMainLoop(nestedMainLoop);
</del><ins>+ GMainLoop* nestedMainLoop = g_main_loop_new(runLoop.m_mainContext.get(), FALSE);
+ runLoop.m_mainLoops.append(adoptGRef(nestedMainLoop));
</ins><span class="cx"> g_main_loop_run(nestedMainLoop);
</span><del>- mainRunLoop.popNestedMainLoop();
</del><ins>+ runLoop.m_mainLoops.removeLast();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-GMainLoop* RunLoop::innermostLoop()
-{
- // The innermost main loop should always be there.
- ASSERT(!m_runLoopMainLoops.isEmpty());
- return m_runLoopMainLoops[0].get();
-}
-
-void RunLoop::pushNestedMainLoop(GMainLoop* nestedLoop)
-{
- // The innermost main loop should always be there.
- ASSERT(!m_runLoopMainLoops.isEmpty());
- m_runLoopMainLoops.append(adoptGRef(nestedLoop));
-}
-
-void RunLoop::popNestedMainLoop()
-{
- // The innermost main loop should always be there.
- ASSERT(!m_runLoopMainLoops.isEmpty());
- m_runLoopMainLoops.removeLast();
-}
-
</del><span class="cx"> void RunLoop::stop()
</span><span class="cx"> {
</span><span class="cx"> // The innermost main loop should always be there.
</span><del>- ASSERT(!m_runLoopMainLoops.isEmpty());
- GRefPtr<GMainLoop> lastMainLoop = m_runLoopMainLoops.last();
</del><ins>+ ASSERT(!m_mainLoops.isEmpty());
+ GRefPtr<GMainLoop> lastMainLoop = m_mainLoops.last();
</ins><span class="cx"> if (g_main_loop_is_running(lastMainLoop.get()))
</span><span class="cx"> g_main_loop_quit(lastMainLoop.get());
</span><span class="cx"> }
</span><span class="lines">@@ -102,8 +85,8 @@
</span><span class="cx"> RefPtr<RunLoop> runLoop(this);
</span><span class="cx"> GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] RunLoop work", std::function<void()>([runLoop] {
</span><span class="cx"> runLoop->performWork();
</span><del>- }), G_PRIORITY_DEFAULT, nullptr, m_runLoopContext.get());
- g_main_context_wakeup(m_runLoopContext.get());
</del><ins>+ }), G_PRIORITY_DEFAULT, nullptr, m_mainContext.get());
+ g_main_context_wakeup(m_mainContext.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunLoop::TimerBase::TimerBase(RunLoop& runLoop)
</span><span class="lines">@@ -119,7 +102,7 @@
</span><span class="cx"> void RunLoop::TimerBase::start(double fireInterval, bool repeat)
</span><span class="cx"> {
</span><span class="cx"> m_timerSource.scheduleAfterDelay("[WebKit] RunLoop::Timer", std::function<bool ()>([this, repeat] { fired(); return repeat; }),
</span><del>- std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(fireInterval)), G_PRIORITY_DEFAULT, nullptr, m_runLoop.m_runLoopContext.get());
</del><ins>+ std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(fireInterval)), G_PRIORITY_DEFAULT, nullptr, m_runLoop.m_mainContext.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RunLoop::TimerBase::stop()
</span></span></pre>
</div>
</div>
</body>
</html>