<!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>[161601] 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/161601">161601</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 16:31:06 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove Blackberry and QNX bits from WTF
https://bugs.webkit.org/show_bug.cgi?id=126726
Reviewed by Benjamin Poulain.
* wtf/Assertions.cpp:
* wtf/Atomics.h:
* wtf/CurrentTime.cpp:
(WTF::currentCPUTime):
* wtf/DateMath.cpp:
* wtf/DisallowCType.h:
* wtf/FeatureDefines.h:
* wtf/InlineASM.h:
* wtf/MathExtras.h:
* wtf/NumberOfCores.cpp:
(WTF::numberOfProcessorCores):
* wtf/OSAllocatorPosix.cpp:
(WTF::OSAllocator::reserveUncommitted):
(WTF::OSAllocator::commit):
(WTF::OSAllocator::decommit):
* wtf/Platform.h:
* wtf/PlatformBlackBerry.cmake: Removed.
* wtf/RAMSize.cpp:
(WTF::computeRAMSize):
* wtf/StackBounds.cpp:
* wtf/ThreadingPthreads.cpp:
(WTF::initializeThreading):
(WTF::initializeCurrentThreadInternal):
* wtf/blackberry/MainThreadBlackBerry.cpp: Removed.
* wtf/blackberry/RunLoopBlackBerry.cpp: Removed.
* wtf/text/AtomicString.h:
* wtf/text/StringImpl.h:
* wtf/text/WTFString.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAtomicsh">trunk/Source/WTF/wtf/Atomics.h</a></li>
<li><a href="#trunkSourceWTFwtfCurrentTimecpp">trunk/Source/WTF/wtf/CurrentTime.cpp</a></li>
<li><a href="#trunkSourceWTFwtfDateMathcpp">trunk/Source/WTF/wtf/DateMath.cpp</a></li>
<li><a href="#trunkSourceWTFwtfDisallowCTypeh">trunk/Source/WTF/wtf/DisallowCType.h</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfInlineASMh">trunk/Source/WTF/wtf/InlineASM.h</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfNumberOfCorescpp">trunk/Source/WTF/wtf/NumberOfCores.cpp</a></li>
<li><a href="#trunkSourceWTFwtfOSAllocatorPosixcpp">trunk/Source/WTF/wtf/OSAllocatorPosix.cpp</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfRAMSizecpp">trunk/Source/WTF/wtf/RAMSize.cpp</a></li>
<li><a href="#trunkSourceWTFwtfStackBoundscpp">trunk/Source/WTF/wtf/StackBounds.cpp</a></li>
<li><a href="#trunkSourceWTFwtfThreadingPthreadscpp">trunk/Source/WTF/wtf/ThreadingPthreads.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfPlatformBlackBerrycmake">trunk/Source/WTF/wtf/PlatformBlackBerry.cmake</a></li>
<li>trunk/Source/WTF/wtf/blackberry/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/ChangeLog 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-01-09 Anders Carlsson <andersca@apple.com>
+
+ Remove Blackberry and QNX bits from WTF
+ https://bugs.webkit.org/show_bug.cgi?id=126726
+
+ Reviewed by Benjamin Poulain.
+
+ * wtf/Assertions.cpp:
+ * wtf/Atomics.h:
+ * wtf/CurrentTime.cpp:
+ (WTF::currentCPUTime):
+ * wtf/DateMath.cpp:
+ * wtf/DisallowCType.h:
+ * wtf/FeatureDefines.h:
+ * wtf/InlineASM.h:
+ * wtf/MathExtras.h:
+ * wtf/NumberOfCores.cpp:
+ (WTF::numberOfProcessorCores):
+ * wtf/OSAllocatorPosix.cpp:
+ (WTF::OSAllocator::reserveUncommitted):
+ (WTF::OSAllocator::commit):
+ (WTF::OSAllocator::decommit):
+ * wtf/Platform.h:
+ * wtf/PlatformBlackBerry.cmake: Removed.
+ * wtf/RAMSize.cpp:
+ (WTF::computeRAMSize):
+ * wtf/StackBounds.cpp:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::initializeThreading):
+ (WTF::initializeCurrentThreadInternal):
+ * wtf/blackberry/MainThreadBlackBerry.cpp: Removed.
+ * wtf/blackberry/RunLoopBlackBerry.cpp: Removed.
+ * wtf/text/AtomicString.h:
+ * wtf/text/StringImpl.h:
+ * wtf/text/WTFString.h:
+
</ins><span class="cx"> 2014-01-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore/platform changes
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -69,10 +69,6 @@
</span><span class="cx"> #include <execinfo.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformLog.h>
-#endif
-
</del><span class="cx"> extern "C" {
</span><span class="cx">
</span><span class="cx"> WTF_ATTRIBUTE_PRINTF(1, 0)
</span><span class="lines">@@ -115,8 +111,6 @@
</span><span class="cx">
</span><span class="cx"> // Fall through to write to stderr in the same manner as other platforms.
</span><span class="cx">
</span><del>-#elif PLATFORM(BLACKBERRY)
- BBLOGV(BlackBerry::Platform::LogLevelCritical, format, args);
</del><span class="cx"> #elif HAVE(ISDEBUGGERPRESENT)
</span><span class="cx"> if (IsDebuggerPresent()) {
</span><span class="cx"> size_t size = 1024;
</span><span class="lines">@@ -151,9 +145,7 @@
</span><span class="cx"> } while (size > 1024);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-#if !PLATFORM(BLACKBERRY)
</del><span class="cx"> vfprintf(stderr, format, args);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
</span></span></pre></div>
<a id="trunkSourceWTFwtfAtomicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Atomics.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Atomics.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/Atomics.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -68,8 +68,6 @@
</span><span class="cx"> #pragma intrinsic(_ReadWriteBarrier)
</span><span class="cx"> #endif
</span><span class="cx"> #include <windows.h>
</span><del>-#elif OS(QNX)
-#include <atomic.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -93,12 +91,6 @@
</span><span class="cx"> inline int64_t atomicDecrement(int64_t volatile* addend) { return InterlockedDecrement64(reinterpret_cast<long long volatile*>(addend)); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(QNX)
-
-// Note, atomic_{add, sub}_value() return the previous value of addend's content.
-inline int atomicIncrement(int volatile* addend) { return static_cast<int>(atomic_add_value(reinterpret_cast<unsigned volatile*>(addend), 1)) + 1; }
-inline int atomicDecrement(int volatile* addend) { return static_cast<int>(atomic_sub_value(reinterpret_cast<unsigned volatile*>(addend), 1)) - 1; }
-
</del><span class="cx"> #elif COMPILER(GCC)
</span><span class="cx">
</span><span class="cx"> inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
</span></span></pre></div>
<a id="trunkSourceWTFwtfCurrentTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CurrentTime.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -238,16 +238,6 @@
</span><span class="cx"> return ecore_time_unix_get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif OS(QNX)
-
-double currentTime()
-{
- struct timespec time;
- if (clock_gettime(CLOCK_REALTIME, &time))
- CRASH();
- return time.tv_sec + time.tv_nsec / 1.0e9;
-}
-
</del><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> double currentTime()
</span><span class="lines">@@ -286,16 +276,6 @@
</span><span class="cx"> return static_cast<double>(g_get_monotonic_time() / 1000000.0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif OS(QNX)
-
-double monotonicallyIncreasingTime()
-{
- struct timespec time;
- if (clock_gettime(CLOCK_MONOTONIC, &time))
- CRASH();
- return time.tv_sec + time.tv_nsec / 1.0e9;
-}
-
</del><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> double monotonicallyIncreasingTime()
</span><span class="lines">@@ -338,11 +318,6 @@
</span><span class="cx"> GetThreadTimes(GetCurrentThread(), &creationTime, &exitTime, &kernelTime.fileTime, &userTime.fileTime);
</span><span class="cx">
</span><span class="cx"> return userTime.fileTimeAsLong / 10000000. + kernelTime.fileTimeAsLong / 10000000.;
</span><del>-#elif OS(QNX)
- struct timespec time;
- if (clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time))
- CRASH();
- return time.tv_sec + time.tv_nsec / 1.0e9;
</del><span class="cx"> #else
</span><span class="cx"> // FIXME: We should return the time the current thread has spent executing.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfDateMathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DateMath.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DateMath.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/DateMath.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -102,11 +102,6 @@
</span><span class="cx"> #include <sys/timeb.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(QNX)
-// qnx6 defines timegm in nbutil.h
-#include <nbutil.h>
-#endif
-
</del><span class="cx"> using namespace WTF;
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span></span></pre></div>
<a id="trunkSourceWTFwtfDisallowCTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/DisallowCType.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/DisallowCType.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/DisallowCType.h 2014-01-10 00:31:06 UTC (rev 161601)
</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) && !PLATFORM(NIX)
</del><ins>+#if !(OS(DARWIN) && PLATFORM(GTK)) && !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="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -334,15 +334,6 @@
</span><span class="cx">
</span><span class="cx"> #endif /* PLATFORM(GTK) */
</span><span class="cx">
</span><del>-/* --------- Blackberry port (QNX) --------- */
-#if PLATFORM(BLACKBERRY)
-
-#if !defined(ENABLE_BLACKBERRY_CREDENTIAL_PERSIST)
-#define ENABLE_BLACKBERRY_CREDENTIAL_PERSIST 1
-#endif
-
-#endif /* PLATFORM(BLACKBERRY) */
-
</del><span class="cx"> /* ENABLE macro defaults for WebCore */
</span><span class="cx"> /* Do not use PLATFORM() tests in this section ! */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfInlineASMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/InlineASM.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/InlineASM.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/InlineASM.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -82,8 +82,7 @@
</span><span class="cx"> #elif OS(LINUX) \
</span><span class="cx"> || OS(FREEBSD) \
</span><span class="cx"> || OS(OPENBSD) \
</span><del>- || OS(NETBSD) \
- || OS(QNX)
</del><ins>+ || OS(NETBSD)
</ins><span class="cx"> // GNU as-compatible syntax.
</span><span class="cx"> #define LOCAL_LABEL_STRING(name) ".L" #name
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/MathExtras.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -43,18 +43,6 @@
</span><span class="cx"> #include <machine/ieee.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(QNX)
-// FIXME: Look into a way to have cmath import its functions into both the standard and global
-// namespace. For now, we include math.h since the QNX cmath header only imports its functions
-// into the standard namespace.
-#include <math.h>
-// These macros from math.h conflict with the real functions in the std namespace.
-#undef signbit
-#undef isnan
-#undef isinf
-#undef isfinite
-#endif
-
</del><span class="cx"> #ifndef M_PI
</span><span class="cx"> const double piDouble = 3.14159265358979323846;
</span><span class="cx"> const float piFloat = 3.14159265358979323846f;
</span><span class="lines">@@ -121,11 +109,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(GCC) && OS(QNX)
-// The stdlib on QNX doesn't contain long abs(long). See PR #104666.
-inline long long abs(long num) { return labs(num); }
-#endif
-
</del><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx">
</span><span class="cx"> // Work around a bug in Win, where atan2(+-infinity, +-infinity) yields NaN instead of specific values.
</span></span></pre></div>
<a id="trunkSourceWTFwtfNumberOfCorescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/NumberOfCores.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NumberOfCores.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/NumberOfCores.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> #include <windows.h>
</span><del>-#elif OS(QNX)
-#include <sys/syspage.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -70,10 +68,6 @@
</span><span class="cx"> GetSystemInfo(&sysInfo);
</span><span class="cx">
</span><span class="cx"> s_numberOfCores = sysInfo.dwNumberOfProcessors;
</span><del>-#elif OS(QNX)
- UNUSED_PARAM(defaultIfUnavailable);
-
- s_numberOfCores = _syspage_ptr->num_cpu;
</del><span class="cx"> #else
</span><span class="cx"> s_numberOfCores = defaultIfUnavailable;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfOSAllocatorPosixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/OSAllocatorPosix.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OSAllocatorPosix.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/OSAllocatorPosix.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -37,22 +37,12 @@
</span><span class="cx">
</span><span class="cx"> void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable, bool executable, bool includesGuardPages)
</span><span class="cx"> {
</span><del>-#if OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> UNUSED_PARAM(usage);
</span><span class="cx"> UNUSED_PARAM(writable);
</span><span class="cx"> UNUSED_PARAM(executable);
</span><span class="cx"> UNUSED_PARAM(includesGuardPages);
</span><span class="cx">
</span><del>- // Reserve memory with PROT_NONE and MAP_LAZY so it isn't committed now.
- void* result = mmap(0, bytes, PROT_NONE, MAP_LAZY | MAP_PRIVATE | MAP_ANON, -1, 0);
- if (result == MAP_FAILED)
- CRASH();
-#elif OS(LINUX)
- UNUSED_PARAM(usage);
- UNUSED_PARAM(writable);
- UNUSED_PARAM(executable);
- UNUSED_PARAM(includesGuardPages);
-
</del><span class="cx"> void* result = mmap(0, bytes, PROT_NONE, MAP_NORESERVE | MAP_PRIVATE | MAP_ANON, -1, 0);
</span><span class="cx"> if (result == MAP_FAILED)
</span><span class="cx"> CRASH();
</span><span class="lines">@@ -64,7 +54,7 @@
</span><span class="cx"> while (madvise(result, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // OS(QNX)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -134,20 +124,12 @@
</span><span class="cx">
</span><span class="cx"> void OSAllocator::commit(void* address, size_t bytes, bool writable, bool executable)
</span><span class="cx"> {
</span><del>-#if OS(QNX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> int protection = PROT_READ;
</span><span class="cx"> if (writable)
</span><span class="cx"> protection |= PROT_WRITE;
</span><span class="cx"> if (executable)
</span><span class="cx"> protection |= PROT_EXEC;
</span><del>- if (MAP_FAILED == mmap(address, bytes, protection, MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0))
- CRASH();
-#elif OS(LINUX)
- int protection = PROT_READ;
- if (writable)
- protection |= PROT_WRITE;
- if (executable)
- protection |= PROT_EXEC;
</del><span class="cx"> if (mprotect(address, bytes, protection))
</span><span class="cx"> CRASH();
</span><span class="cx"> madvise(address, bytes, MADV_WILLNEED);
</span><span class="lines">@@ -166,10 +148,7 @@
</span><span class="cx">
</span><span class="cx"> void OSAllocator::decommit(void* address, size_t bytes)
</span><span class="cx"> {
</span><del>-#if OS(QNX)
- // Use PROT_NONE and MAP_LAZY to decommit the pages.
- mmap(address, bytes, PROT_NONE, MAP_FIXED | MAP_LAZY | MAP_PRIVATE | MAP_ANON, -1, 0);
-#elif OS(LINUX)
</del><ins>+#if OS(LINUX)
</ins><span class="cx"> madvise(address, bytes, MADV_DONTNEED);
</span><span class="cx"> if (mprotect(address, bytes, PROT_NONE))
</span><span class="cx"> CRASH();
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/Platform.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -382,11 +382,6 @@
</span><span class="cx"> #define WTF_OS_OPENBSD 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* OS(QNX) - QNX */
-#if defined(__QNXNTO__)
-#define WTF_OS_QNX 1
-#endif
-
</del><span class="cx"> /* OS(SOLARIS) - Solaris */
</span><span class="cx"> #if defined(sun) || defined(__sun)
</span><span class="cx"> #define WTF_OS_SOLARIS 1
</span><span class="lines">@@ -413,7 +408,6 @@
</span><span class="cx"> || OS(LINUX) \
</span><span class="cx"> || OS(NETBSD) \
</span><span class="cx"> || OS(OPENBSD) \
</span><del>- || OS(QNX) \
</del><span class="cx"> || OS(SOLARIS) \
</span><span class="cx"> || defined(unix) \
</span><span class="cx"> || defined(__unix) \
</span><span class="lines">@@ -426,15 +420,12 @@
</span><span class="cx"> /* FIXME: these are all mixes of OS, operating environment and policy choices. */
</span><span class="cx"> /* PLATFORM(EFL) */
</span><span class="cx"> /* PLATFORM(GTK) */
</span><del>-/* PLATFORM(BLACKBERRY) */
</del><span class="cx"> /* PLATFORM(MAC) */
</span><span class="cx"> /* PLATFORM(WIN) */
</span><span class="cx"> #if defined(BUILDING_EFL__)
</span><span class="cx"> #define WTF_PLATFORM_EFL 1
</span><span class="cx"> #elif defined(BUILDING_GTK__)
</span><span class="cx"> #define WTF_PLATFORM_GTK 1
</span><del>-#elif defined(BUILDING_BLACKBERRY__)
-#define WTF_PLATFORM_BLACKBERRY 1
</del><span class="cx"> #elif defined(BUILDING_NIX__)
</span><span class="cx"> #include "nix/PlatformNix.h"
</span><span class="cx"> #elif OS(DARWIN)
</span><span class="lines">@@ -465,12 +456,6 @@
</span><span class="cx"> #define WTF_USE_CA 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#define WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION 1
-#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_DITHERING 1
-#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_FANCY_UPSAMPLING 1
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define WTF_USE_CAIRO 1
</span><span class="cx"> #define WTF_USE_GLIB 1
</span><span class="lines">@@ -560,7 +545,7 @@
</span><span class="cx"> #define WTF_USE_PTHREADS 1
</span><span class="cx"> #endif /* OS(UNIX) */
</span><span class="cx">
</span><del>-#if OS(UNIX) && !OS(QNX)
</del><ins>+#if OS(UNIX)
</ins><span class="cx"> #define HAVE_LANGINFO_H 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -569,7 +554,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(HAVE_VASPRINTF)
</span><del>-#if !COMPILER(MSVC) && !COMPILER(MINGW) && !(COMPILER(GCC) && OS(QNX))
</del><ins>+#if !COMPILER(MSVC) && !COMPILER(MINGW)
</ins><span class="cx"> #define HAVE_VASPRINTF 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -615,11 +600,6 @@
</span><span class="cx"> #define HAVE_VIRTUALALLOC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(QNX)
-#define HAVE_MADV_FREE_REUSE 1
-#define HAVE_MADV_FREE 1
-#endif
-
</del><span class="cx"> /* ENABLE macro defaults */
</span><span class="cx">
</span><span class="cx"> /* FIXME: move out all ENABLE() defines from here to FeatureDefines.h */
</span><span class="lines">@@ -683,7 +663,6 @@
</span><span class="cx"> && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
</span><span class="cx"> && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
</span><span class="cx"> && !OS(WINCE) \
</span><del>- && !OS(QNX) \
</del><span class="cx"> && !(OS(WINDOWS) && CPU(X86_64))
</span><span class="cx"> #define ENABLE_JIT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -739,7 +718,7 @@
</span><span class="cx"> #define ENABLE_DFG_JIT 1
</span><span class="cx"> #endif
</span><span class="cx"> /* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
</span><del>-#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || PLATFORM(BLACKBERRY) || PLATFORM(GTK))
</del><ins>+#if (CPU(ARM_THUMB2) || CPU(ARM64)) && (PLATFORM(IOS) || PLATFORM(GTK))
</ins><span class="cx"> #define ENABLE_DFG_JIT 1
</span><span class="cx"> #endif
</span><span class="cx"> /* Enable the DFG JIT on ARM, MIPS and SH4. */
</span><span class="lines">@@ -960,7 +939,7 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_OBJECT_MARK_LOGGING 0
</span><span class="cx">
</span><del>-#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(BLACKBERRY) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
</del><ins>+#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
</ins><span class="cx"> #define ENABLE_PARALLEL_GC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1021,7 +1000,7 @@
</span><span class="cx">
</span><span class="cx"> #define WTF_USE_GRAMMAR_CHECKING 1
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(BLACKBERRY) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(EFL)
</ins><span class="cx"> #define WTF_USE_UNIFIED_TEXT_CHECKING 1
</span><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(IOS) && PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformBlackBerrycmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/PlatformBlackBerry.cmake (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/PlatformBlackBerry.cmake 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-list(APPEND WTF_SOURCES
- blackberry/MainThreadBlackBerry.cpp
- blackberry/RunLoopBlackBerry.cpp
-)
</del></span></pre></div>
<a id="trunkSourceWTFwtfRAMSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RAMSize.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RAMSize.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/RAMSize.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> #include <windows.h>
</span><del>-#elif OS(QNX)
-#include <sys/stat.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -77,11 +75,6 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> return ramSizeGuess;
</span><span class="cx"> return status.ullTotalPhys;
</span><del>-#elif OS(QNX)
- struct stat mst;
- if (stat("/proc", &mst))
- return ramSizeGuess;
- return mst.st_size;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfStackBoundscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StackBounds.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StackBounds.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/StackBounds.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -35,15 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include <thread.h>
</span><span class="cx">
</span><del>-#elif OS(QNX)
-
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/procfs.h>
-
</del><span class="cx"> #elif OS(UNIX)
</span><span class="cx">
</span><span class="cx"> #include <pthread.h>
</span><span class="lines">@@ -74,31 +65,6 @@
</span><span class="cx"> m_bound = static_cast<char*>(m_origin) - size;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif OS(QNX)
-
-void StackBounds::initialize()
-{
- void* stackBase = 0;
- size_t stackSize = 0;
-
- struct _debug_thread_info threadInfo;
- memset(&threadInfo, 0, sizeof(threadInfo));
- threadInfo.tid = pthread_self();
- int fd = open("/proc/self", O_RDONLY);
- if (fd == -1) {
- LOG_ERROR("Unable to open /proc/self (errno: %d)", errno);
- CRASH();
- }
- devctl(fd, DCMD_PROC_TIDSTATUS, &threadInfo, sizeof(threadInfo), 0);
- close(fd);
- stackBase = reinterpret_cast<void*>(threadInfo.stkbase);
- stackSize = threadInfo.stksize;
- ASSERT(stackBase);
-
- m_bound = static_cast<char*>(stackBase) + 0x1000; // 4kb guard page
- m_origin = static_cast<char*>(stackBase) + stackSize;
-}
-
</del><span class="cx"> #elif OS(SOLARIS)
</span><span class="cx">
</span><span class="cx"> void StackBounds::initialize()
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingPthreadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -110,26 +110,11 @@
</span><span class="cx"> return mutex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(QNX) && CPU(ARM_THUMB2)
-static void enableIEEE754Denormal()
-{
- // Clear the ARM_VFP_FPSCR_FZ flag in FPSCR.
- unsigned fpscr;
- asm volatile("vmrs %0, fpscr" : "=r"(fpscr));
- fpscr &= ~0x01000000u;
- asm volatile("vmsr fpscr, %0" : : "r"(fpscr));
-}
-#endif
-
</del><span class="cx"> void initializeThreading()
</span><span class="cx"> {
</span><span class="cx"> if (atomicallyInitializedStaticMutex)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(QNX) && CPU(ARM_THUMB2)
- enableIEEE754Denormal();
-#endif
-
</del><span class="cx"> WTF::double_conversion::initialize();
</span><span class="cx"> // StringImpl::empty() does not construct its static string in a threadsafe fashion,
</span><span class="cx"> // so ensure it has been initialized from here.
</span><span class="lines">@@ -216,8 +201,6 @@
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(PTHREAD_SETNAME_NP)
</span><span class="cx"> pthread_setname_np(threadName);
</span><del>-#elif OS(QNX)
- pthread_setname_np(pthread_self(), threadName);
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(threadName);
</span><span class="cx"> #endif
</span><span class="lines">@@ -228,10 +211,6 @@
</span><span class="cx"> objc_registerThreadWithCollector();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(QNX) && CPU(ARM_THUMB2)
- enableIEEE754Denormal();
-#endif
-
</del><span class="cx"> ThreadIdentifier id = identifierByPthreadHandle(pthread_self());
</span><span class="cx"> ASSERT(id);
</span><span class="cx"> ThreadIdentifierData::initialize(id);
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -153,10 +153,6 @@
</span><span class="cx"> AtomicString(NSString* s) : m_string(add((CFStringRef)s)) { }
</span><span class="cx"> operator NSString*() const { return m_string; }
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(BLACKBERRY)
- AtomicString(const BlackBerry::Platform::String& s) : m_string(add(String(s).impl())) { }
- operator BlackBerry::Platform::String() const { return m_string; }
-#endif
</del><span class="cx">
</span><span class="cx"> // AtomicString::fromUTF8 will return a null string if
</span><span class="cx"> // the input data contains invalid UTF-8 sequences.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -43,10 +43,6 @@
</span><span class="cx"> @class NSString;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-#include <BlackBerryPlatformString.h>
-#endif
-
</del><span class="cx"> // FIXME: This is a temporary layering violation while we move string code to WTF.
</span><span class="cx"> // Landing the file moves in one patch, will follow on with patches to change the namespaces.
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (161600 => 161601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2014-01-10 00:26:05 UTC (rev 161600)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-01-10 00:31:06 UTC (rev 161601)
</span><span class="lines">@@ -32,14 +32,6 @@
</span><span class="cx"> #include <objc/objc.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
-namespace BlackBerry {
-namespace Platform {
-class String;
-}
-}
-#endif
-
</del><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class CString;
</span><span class="lines">@@ -414,11 +406,6 @@
</span><span class="cx"> operator NSString*() const { if (!m_impl) return @""; return *m_impl; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(BLACKBERRY)
- String(const BlackBerry::Platform::String&);
- operator BlackBerry::Platform::String() const;
-#endif
-
</del><span class="cx"> WTF_EXPORT_STRING_API static String make8BitFrom16BitSource(const UChar*, size_t);
</span><span class="cx"> template<size_t inlineCapacity>
</span><span class="cx"> static String make8BitFrom16BitSource(const Vector<UChar, inlineCapacity>& buffer)
</span></span></pre>
</div>
</div>
</body>
</html>