<!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>[159857] 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/159857">159857</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-28 12:55:19 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Nix Upstream: Updating Nix WTF files
https://bugs.webkit.org/show_bug.cgi?id=124980
Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> on 2013-11-28
Reviewed by Csaba Osztrogonác.
Just to sync our private repo files and the trunk, as part of the upstream process.
* wtf/DisallowCType.h:
* wtf/PlatformNix.cmake:
* wtf/nix/FeatureDefinesNix.h:
* wtf/nix/PlatformNix.h:
* wtf/nix/RunLoopNix.cpp: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfDisallowCTypeh">trunk/Source/WTF/wtf/DisallowCType.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformNixcmake">trunk/Source/WTF/wtf/PlatformNix.cmake</a></li>
<li><a href="#trunkSourceWTFwtfnixFeatureDefinesNixh">trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h</a></li>
<li><a href="#trunkSourceWTFwtfnixPlatformNixh">trunk/Source/WTF/wtf/nix/PlatformNix.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfnixRunLoopNixcpp">trunk/Source/WTF/wtf/nix/RunLoopNix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (159856 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-11-28 20:53:22 UTC (rev 159856)
+++ trunk/Source/WTF/ChangeLog 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-28 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ Nix Upstream: Updating Nix WTF files
+ https://bugs.webkit.org/show_bug.cgi?id=124980
+
+ Reviewed by Csaba Osztrogonác.
+
+ Just to sync our private repo files and the trunk, as part of the upstream process.
+
+ * wtf/DisallowCType.h:
+ * wtf/PlatformNix.cmake:
+ * wtf/nix/FeatureDefinesNix.h:
+ * wtf/nix/PlatformNix.h:
+ * wtf/nix/RunLoopNix.cpp: Added.
+
</ins><span class="cx"> 2013-11-28 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove feature: CSS variables
</span></span></pre></div>
<a id="trunkSourceWTFwtfDisallowCTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DisallowCType.h (159856 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DisallowCType.h 2013-11-28 20:53:22 UTC (rev 159856)
+++ trunk/Source/WTF/wtf/DisallowCType.h 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
</span><span class="cx"> // isacii().
</span><span class="cx"> #include <wtf/Platform.h>
</span><del>-#if !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
</del><ins>+#if !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && !PLATFORM(NIX)
</ins><span class="cx">
</span><span class="cx"> #include <ctype.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformNixcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformNix.cmake (159856 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformNix.cmake 2013-11-28 20:53:22 UTC (rev 159856)
+++ trunk/Source/WTF/wtf/PlatformNix.cmake 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx"> gobject/GlibUtilities.cpp
</span><span class="cx">
</span><span class="cx"> gtk/MainThreadGtk.cpp
</span><ins>+
+ nix/RunLoopNix.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWTFwtfnixFeatureDefinesNixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h (159856 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h 2013-11-28 20:53:22 UTC (rev 159856)
+++ trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -1,16 +1,16 @@
</span><span class="cx"> /*
</span><del>-* Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</del><ins>+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</ins><span class="cx"> * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span><span class="cx"> * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
</span><span class="lines">@@ -30,6 +30,10 @@
</span><span class="cx"> #define ENABLE_3D_RENDERING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_8BIT_TEXTRUN)
+#define ENABLE_8BIT_TEXTRUN 1
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_ACCELERATED_2D_CANVAS)
</span><span class="cx"> #define ENABLE_ACCELERATED_2D_CANVAS 0
</span><span class="cx"> #endif
</span><span class="lines">@@ -150,6 +154,10 @@
</span><span class="cx"> #define ENABLE_INSPECTOR_SERVER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_INPUT_SPEECH)
+#define ENABLE_INPUT_SPEECH 1
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_JAVASCRIPT_DEBUGGER)
</span><span class="cx"> #define ENABLE_JAVASCRIPT_DEBUGGER 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -174,6 +182,10 @@
</span><span class="cx"> #define ENABLE_MATHML 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_MEDIA_STREAM)
+#define ENABLE_MEDIA_STREAM 0
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_METER_ELEMENT)
</span><span class="cx"> #define ENABLE_METER_ELEMENT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -190,6 +202,14 @@
</span><span class="cx"> #define ENABLE_NETWORK_INFO 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_NETWORK_PROCESS)
+#define ENABLE_NETWORK_PROCESS 0
+#endif
+
+#if !defined(ENABLE_OPENTYPE_VERTICAL)
+#define ENABLE_OPENTYPE_VERTICAL 1
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_PAGE_VISIBILITY_API)
</span><span class="cx"> #define ENABLE_PAGE_VISIBILITY_API 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfnixPlatformNixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/nix/PlatformNix.h (159856 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/nix/PlatformNix.h 2013-11-28 20:53:22 UTC (rev 159856)
+++ trunk/Source/WTF/wtf/nix/PlatformNix.h 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #define WTF_USE_HARFBUZZ 1
</span><span class="cx"> #define WTF_USE_HARFBUZZ_NG 1
</span><span class="cx"> #define WTF_USE_ICU_UNICODE 1
</span><del>-#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
</del><span class="cx"> #define WTF_USE_LEVELDB 1
</span><span class="cx"> #define WTF_USE_PTHREADS 1
</span><span class="cx"> #define WTF_USE_TEXTURE_MAPPER 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfnixRunLoopNixcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/nix/RunLoopNix.cpp (0 => 159857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/nix/RunLoopNix.cpp (rev 0)
+++ trunk/Source/WTF/wtf/nix/RunLoopNix.cpp 2013-11-28 20:55:19 UTC (rev 159857)
</span><span class="lines">@@ -0,0 +1,172 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "RunLoop.h"
+
+#include <glib.h>
+
+#include <wtf/MainThread.h>
+
+namespace WTF {
+
+RunLoop::RunLoop()
+{
+ // g_main_context_default() doesn't add an extra reference.
+ 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));
+ ASSERT(innermostLoop);
+ m_runLoopMainLoops.append(innermostLoop);
+}
+
+RunLoop::~RunLoop()
+{
+ for (int i = m_runLoopMainLoops.size() - 1; i >= 0; --i) {
+ if (!g_main_loop_is_running(m_runLoopMainLoops[i].get()))
+ continue;
+ g_main_loop_quit(m_runLoopMainLoops[i].get());
+ }
+}
+
+void RunLoop::run()
+{
+ RunLoop* mainRunLoop = RunLoop::current();
+ GMainLoop* innermostLoop = mainRunLoop->innermostLoop();
+ if (!g_main_loop_is_running(innermostLoop)) {
+ g_main_loop_run(innermostLoop);
+ return;
+ }
+
+ // Create and run a nested loop if the innermost one was already running.
+ GMainLoop* nestedMainLoop = g_main_loop_new(0, FALSE);
+ mainRunLoop->pushNestedMainLoop(nestedMainLoop);
+ g_main_loop_run(nestedMainLoop);
+ mainRunLoop->popNestedMainLoop();
+}
+
+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();
+}
+
+void RunLoop::stop()
+{
+ // The innermost main loop should always be there.
+ ASSERT(!m_runLoopMainLoops.isEmpty());
+ GRefPtr<GMainLoop> lastMainLoop = m_runLoopMainLoops.last();
+ if (g_main_loop_is_running(lastMainLoop.get()))
+ g_main_loop_quit(lastMainLoop.get());
+}
+
+gboolean RunLoop::queueWork(RunLoop* runLoop)
+{
+ runLoop->performWork();
+ return FALSE;
+}
+
+void RunLoop::wakeUp()
+{
+ GRefPtr<GSource> source = adoptGRef(g_idle_source_new());
+ g_source_set_priority(source.get(), G_PRIORITY_DEFAULT);
+ g_source_set_callback(source.get(), reinterpret_cast<GSourceFunc>(&RunLoop::queueWork), this, 0);
+ g_source_attach(source.get(), m_runLoopContext.get());
+
+ g_main_context_wakeup(m_runLoopContext.get());
+}
+
+RunLoop::TimerBase::TimerBase(RunLoop* runLoop)
+ : m_runLoop(runLoop)
+ , m_timerSource(0)
+{
+}
+
+RunLoop::TimerBase::~TimerBase()
+{
+ stop();
+}
+
+void RunLoop::TimerBase::clearTimerSource()
+{
+ m_timerSource = 0;
+}
+
+gboolean RunLoop::TimerBase::timerFiredCallback(RunLoop::TimerBase* timer)
+{
+ GSource* currentTimerSource = timer->m_timerSource.get();
+ bool isRepeating = timer->isRepeating();
+ // This can change the timerSource by starting a new timer within the callback.
+ if (!isRepeating && currentTimerSource == timer->m_timerSource.get())
+ timer->clearTimerSource();
+
+ timer->fired();
+ return isRepeating;
+}
+
+void RunLoop::TimerBase::start(double fireInterval, bool repeat)
+{
+ if (m_timerSource)
+ stop();
+
+ m_timerSource = adoptGRef(g_timeout_source_new(static_cast<guint>(fireInterval * 1000)));
+ m_isRepeating = repeat;
+ g_source_set_callback(m_timerSource.get(), reinterpret_cast<GSourceFunc>(&RunLoop::TimerBase::timerFiredCallback), this, 0);
+ g_source_attach(m_timerSource.get(), m_runLoop->m_runLoopContext.get());
+}
+
+void RunLoop::TimerBase::stop()
+{
+ if (!m_timerSource)
+ return;
+
+ g_source_destroy(m_timerSource.get());
+ clearTimerSource();
+}
+
+bool RunLoop::TimerBase::isActive() const
+{
+ return m_timerSource;
+}
+
+} // namespace WTF
+
</ins></span></pre>
</div>
</div>
</body>
</html>