Changeset 147894 in webkit


Ignore:
Timestamp:
Apr 7, 2013 11:20:12 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

Remove the android code from WebKit Template Framework
​https://bugs.webkit.org/show_bug.cgi?id=114138

Reviewed by Dirk Schulze.

  • wtf/Assertions.cpp:
  • wtf/Atomics.h:
  • wtf/MathExtras.h:
  • wtf/Platform.h:
  • wtf/ThreadIdentifierDataPthreads.cpp:
Location:
trunk/Source/WTF
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r147892 r147894  
     12013-04-07  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Remove the android code from WebKit Template Framework
     4        https://bugs.webkit.org/show_bug.cgi?id=114138
     5
     6        Reviewed by Dirk Schulze.
     7
     8        * wtf/Assertions.cpp:
     9        * wtf/Atomics.h:
     10        * wtf/MathExtras.h:
     11        * wtf/Platform.h:
     12        * wtf/ThreadIdentifierDataPthreads.cpp:
     13
    1142013-04-07  Oliver Hunt  <oliver@apple.com>
    215

  • trunk/Source/WTF/wtf/Assertions.cpp

    r141919 r147894  
    6262#endif
    6363
    64 #if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
     64#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
    6565#include <cxxabi.h>
    6666#include <dlfcn.h>
    6767#include <execinfo.h>
    68 #endif
    69 
    70 #if OS(ANDROID)
    71 #include "android/log.h"
    7268#endif
    7369
    … …  
    120116#elif PLATFORM(BLACKBERRY)
    121117    BBLOGV(BlackBerry::Platform::LogLevelCritical, format, args);
    122 #elif OS(ANDROID)
    123     __android_log_vprint(ANDROID_LOG_WARN, "WebKit", format, args);
    124118#elif HAVE(ISDEBUGGERPRESENT)
    125119    if (IsDebuggerPresent()) {
    … …  
    246240void WTFGetBacktrace(void** stack, int* size)
    247241{
    248 #if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
     242#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
    249243    *size = backtrace(stack, *size);
    250244#elif OS(WINDOWS) && !OS(WINCE)
    … …  
    285279#      define WTF_USE_BACKTRACE_SYMBOLS 1
    286280#    endif
    287 #  elif !OS(ANDROID)
    288 #    define WTF_USE_DLADDR 1
    289281#  endif
    290282#endif

  • trunk/Source/WTF/wtf/Atomics.h

    r140930 r147894  
    6868#elif OS(QNX)
    6969#include <atomic.h>
    70 #elif OS(ANDROID)
    71 #include <sys/atomics.h>
    7270#endif
    7371
    … …  
    10098inline int atomicIncrement(int volatile* addend) { return static_cast<int>(atomic_add_value(reinterpret_cast<unsigned volatile*>(addend), 1)) + 1; }
    10199inline int atomicDecrement(int volatile* addend) { return static_cast<int>(atomic_sub_value(reinterpret_cast<unsigned volatile*>(addend), 1)) - 1; }
    102 
    103 #elif OS(ANDROID)
    104 #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
    105 
    106 // Note, __atomic_{inc, dec}() return the previous value of addend's content.
    107 inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
    108 inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
    109100
    110101#elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc

  • trunk/Source/WTF/wtf/MathExtras.h

    r143687 r147894  
    147147#endif
    148148
    149 #if OS(ANDROID) || COMPILER(MSVC)
    150 // ANDROID and MSVC's math.h does not currently supply log2 or log2f.
     149#if COMPILER(MSVC)
     150// MSVC's math.h does not currently supply log2 or log2f.
    151151inline double log2(double num)
    152152{
    153     // This constant is roughly M_LN2, which is not provided by default on Windows and Android.
     153    // This constant is roughly M_LN2, which is not provided by default on Windows.
    154154    return log(num) / 0.693147180559945309417232121458176568;
    155155}
    … …  
    157157inline float log2f(float num)
    158158{
    159     // This constant is roughly M_LN2, which is not provided by default on Windows and Android.
     159    // This constant is roughly M_LN2, which is not provided by default on Windows.
    160160    return logf(num) / 0.693147180559945309417232121458176568f;
    161161}

  • trunk/Source/WTF/wtf/Platform.h

    r147881 r147894  
    182182    && !defined(__EABI__) \
    183183    && !defined(__VFP_FP__) \
    184     && !defined(_WIN32_WCE) \
    185     && !defined(ANDROID)
     184    && !defined(_WIN32_WCE)
    186185#define WTF_CPU_MIDDLE_ENDIAN 1
    187186
    … …  
    325324   virtual memory, not to choose a GUI toolkit ==== */
    326325
    327 /* OS(ANDROID) - Android */
    328 #ifdef ANDROID
    329 #define WTF_OS_ANDROID 1
    330 #endif
    331 
    332326/* OS(AIX) - AIX */
    333327#ifdef _AIX
    … …  
    417411/* OS(UNIX) - Any Unix-like system */
    418412#if   OS(AIX)              \
    419     || OS(ANDROID)          \
    420413    || OS(DARWIN)           \
    421414    || OS(FREEBSD)          \
    … …  
    599592#endif /* OS(UNIX) */
    600593
    601 #if OS(UNIX) && !OS(ANDROID) && !OS(QNX)
     594#if OS(UNIX) && !OS(QNX)
    602595#define HAVE_LANGINFO_H 1
    603596#endif
    … …  
    619612#endif
    620613
    621 #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(ANDROID)
     614#if !OS(WINDOWS) && !OS(SOLARIS)
    622615#define HAVE_TM_GMTOFF 1
    623616#define HAVE_TM_ZONE 1

  • trunk/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp

    r126208 r147894  
    3737#include "Threading.h"
    3838
    39 #if OS(ANDROID) || OS(HURD)
     39#if OS(HURD)
    4040// PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
    4141#define PTHREAD_KEYS_MAX 1024
Note: See TracChangeset for help on using the changeset viewer.