<!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>[184333] 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/184333">184333</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-05-14 02:32:49 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] RunLoop constructor should properly retrieve or establish the thread-default GMainContext
https://bugs.webkit.org/show_bug.cgi?id=144732
Reviewed by Carlos Garcia Campos.
RunLoop constructor in the GTK implementation should use the
existing thread-default context, create a new one if not on
the main thread, or use the global-default one if on the main
thread.
In RunLoop::run(), the GMainContext should then be pushed as
the thread-default before calling g_main_loop_run(), and popped
off when the main loop stops.
* wtf/gtk/RunLoopGtk.cpp:
(WTF::RunLoop::RunLoop):
(WTF::RunLoop::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</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 (184332 => 184333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-14 07:59:14 UTC (rev 184332)
+++ trunk/Source/WTF/ChangeLog 2015-05-14 09:32:49 UTC (rev 184333)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-14 Žan Doberšek <zdobersek@igalia.com>
+
+ [GTK] RunLoop constructor should properly retrieve or establish the thread-default GMainContext
+ https://bugs.webkit.org/show_bug.cgi?id=144732
+
+ Reviewed by Carlos Garcia Campos.
+
+ RunLoop constructor in the GTK implementation should use the
+ existing thread-default context, create a new one if not on
+ the main thread, or use the global-default one if on the main
+ thread.
+
+ In RunLoop::run(), the GMainContext should then be pushed as
+ the thread-default before calling g_main_loop_run(), and popped
+ off when the main loop stops.
+
+ * wtf/gtk/RunLoopGtk.cpp:
+ (WTF::RunLoop::RunLoop):
+ (WTF::RunLoop::run):
+
</ins><span class="cx"> 2015-05-13 Oliver Hunt <oliver@apple.com>
</span><span class="cx"> Ensure that all the smart pointer types in WTF clear their pointer before deref
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143789
</span></span></pre></div>
<a id="trunkSourceWTFwtfgtkRunLoopGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp (184332 => 184333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2015-05-14 07:59:14 UTC (rev 184332)
+++ trunk/Source/WTF/wtf/gtk/RunLoopGtk.cpp 2015-05-14 09:32:49 UTC (rev 184333)
</span><span class="lines">@@ -34,9 +34,11 @@
</span><span class="cx">
</span><span class="cx"> RunLoop::RunLoop()
</span><span class="cx"> {
</span><del>- // g_main_context_default() doesn't add an extra reference.
- m_mainContext = isMainThread() ? g_main_context_default() : adoptGRef(g_main_context_new());
</del><ins>+ m_mainContext = g_main_context_get_thread_default();
+ if (!m_mainContext)
+ m_mainContext = isMainThread() ? g_main_context_default() : adoptGRef(g_main_context_new());
</ins><span class="cx"> ASSERT(m_mainContext);
</span><ins>+
</ins><span class="cx"> GRefPtr<GMainLoop> innermostLoop = adoptGRef(g_main_loop_new(m_mainContext.get(), FALSE));
</span><span class="cx"> ASSERT(innermostLoop);
</span><span class="cx"> m_mainLoops.append(innermostLoop);
</span><span class="lines">@@ -54,20 +56,27 @@
</span><span class="cx"> void RunLoop::run()
</span><span class="cx"> {
</span><span class="cx"> RunLoop& runLoop = RunLoop::current();
</span><ins>+ GMainContext* mainContext = runLoop.m_mainContext.get();
</ins><span class="cx">
</span><span class="cx"> // The innermost main loop should always be there.
</span><span class="cx"> ASSERT(!runLoop.m_mainLoops.isEmpty());
</span><span class="cx">
</span><span class="cx"> GMainLoop* innermostLoop = runLoop.m_mainLoops[0].get();
</span><span class="cx"> if (!g_main_loop_is_running(innermostLoop)) {
</span><ins>+ g_main_context_push_thread_default(mainContext);
</ins><span class="cx"> g_main_loop_run(innermostLoop);
</span><ins>+ g_main_context_pop_thread_default(mainContext);
</ins><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(runLoop.m_mainContext.get(), FALSE);
</del><ins>+ GMainLoop* nestedMainLoop = g_main_loop_new(mainContext, FALSE);
</ins><span class="cx"> runLoop.m_mainLoops.append(adoptGRef(nestedMainLoop));
</span><ins>+
+ g_main_context_push_thread_default(mainContext);
</ins><span class="cx"> g_main_loop_run(nestedMainLoop);
</span><ins>+ g_main_context_pop_thread_default(mainContext);
+
</ins><span class="cx"> runLoop.m_mainLoops.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>