Diff
Modified: trunk/Source/WTF/ChangeLog (159856 => 159857)
--- 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)
@@ -1,3 +1,18 @@
+2013-11-28 Thiago de Barros Lacerda <thiago.lace...@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.
+
2013-11-28 Antti Koivisto <an...@apple.com>
Remove feature: CSS variables
Modified: trunk/Source/WTF/wtf/DisallowCType.h (159856 => 159857)
--- 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)
@@ -41,7 +41,7 @@
// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
// isacii().
#include <wtf/Platform.h>
-#if !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION)
+#if !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && !PLATFORM(NIX)
#include <ctype.h>
Modified: trunk/Source/WTF/wtf/PlatformNix.cmake (159856 => 159857)
--- 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)
@@ -4,6 +4,8 @@
gobject/GlibUtilities.cpp
gtk/MainThreadGtk.cpp
+
+ nix/RunLoopNix.cpp
)
list(APPEND WTF_LIBRARIES
Modified: trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h (159856 => 159857)
--- 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)
@@ -1,16 +1,16 @@
/*
-* 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
+ * 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
* "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 THE COPYRIGHT
@@ -30,6 +30,10 @@
#define ENABLE_3D_RENDERING 1
#endif
+#if !defined(ENABLE_8BIT_TEXTRUN)
+#define ENABLE_8BIT_TEXTRUN 1
+#endif
+
#if !defined(ENABLE_ACCELERATED_2D_CANVAS)
#define ENABLE_ACCELERATED_2D_CANVAS 0
#endif
@@ -150,6 +154,10 @@
#define ENABLE_INSPECTOR_SERVER 1
#endif
+#if !defined(ENABLE_INPUT_SPEECH)
+#define ENABLE_INPUT_SPEECH 1
+#endif
+
#if !defined(ENABLE_JAVASCRIPT_DEBUGGER)
#define ENABLE_JAVASCRIPT_DEBUGGER 1
#endif
@@ -174,6 +182,10 @@
#define ENABLE_MATHML 1
#endif
+#if !defined(ENABLE_MEDIA_STREAM)
+#define ENABLE_MEDIA_STREAM 0
+#endif
+
#if !defined(ENABLE_METER_ELEMENT)
#define ENABLE_METER_ELEMENT 1
#endif
@@ -190,6 +202,14 @@
#define ENABLE_NETWORK_INFO 1
#endif
+#if !defined(ENABLE_NETWORK_PROCESS)
+#define ENABLE_NETWORK_PROCESS 0
+#endif
+
+#if !defined(ENABLE_OPENTYPE_VERTICAL)
+#define ENABLE_OPENTYPE_VERTICAL 1
+#endif
+
#if !defined(ENABLE_PAGE_VISIBILITY_API)
#define ENABLE_PAGE_VISIBILITY_API 1
#endif
Modified: trunk/Source/WTF/wtf/nix/PlatformNix.h (159856 => 159857)
--- 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)
@@ -39,7 +39,6 @@
#define WTF_USE_HARFBUZZ 1
#define WTF_USE_HARFBUZZ_NG 1
#define WTF_USE_ICU_UNICODE 1
-#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
#define WTF_USE_LEVELDB 1
#define WTF_USE_PTHREADS 1
#define WTF_USE_TEXTURE_MAPPER 1
Added: trunk/Source/WTF/wtf/nix/RunLoopNix.cpp (0 => 159857)
--- 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)
@@ -0,0 +1,172 @@
+/*
+ * 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
+
