From 11fcf8d351180d7af79565cd6de3203bcb588095 Mon Sep 17 00:00:00 2001 From: "eric@webkit.org" Date: Fri, 20 Nov 2009 06:03:15 +0000 Subject: [PATCH] 2009-11-19 Steve Block Android port lacks configuration in Platform.h and config.h. https://bugs.webkit.org/show_bug.cgi?id=31671 * wtf/Platform.h: Modified. Added Android-specific configuration. 2009-11-19 Steve Block Reviewed by Darin Fisher. Android port lacks configuration in Platform.h and config.h. https://bugs.webkit.org/show_bug.cgi?id=31671 Build change only. No new tests possible. * config.h: Modified. Added Android-specific configuration. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51228 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 7 +++++++ JavaScriptCore/wtf/Platform.h | 38 +++++++++++++++++++++++++++++++---- WebCore/ChangeLog | 11 ++++++++++ WebCore/config.h | 28 ++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 8e585b14c5f0..fcb51d800230 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,10 @@ +2009-11-19 Steve Block + + Android port lacks configuration in Platform.h and config.h. + https://bugs.webkit.org/show_bug.cgi?id=31671 + + * wtf/Platform.h: Modified. Added Android-specific configuration. + 2009-11-19 Alexey Proskuryakov Reviewed by Darin Adler. diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 99a47bf2c4b9..d3a4077250ac 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -132,7 +132,8 @@ || defined(__unix__) \ || defined(_AIX) \ || defined(__HAIKU__) \ - || defined(__QNXNTO__) + || defined(__QNXNTO__) \ + || defined(ANDROID) #define WTF_PLATFORM_UNIX 1 #endif @@ -182,6 +183,11 @@ #define WTF_PLATFORM_IPHONE 0 #endif +/* PLATFORM(ANDROID) */ +#if defined(ANDROID) +#define WTF_PLATFORM_ANDROID 1 +#endif + /* Graphics engines */ /* PLATFORM(CG) and PLATFORM(CI) */ @@ -205,7 +211,7 @@ /* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */ /* FIXME: This should be changed from a blacklist to a whitelist */ -#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU) +#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU) && !PLATFORM(ANDROID) #define WTF_PLATFORM_CAIRO 1 #endif @@ -252,7 +258,8 @@ #elif !defined(__ARM_EABI__) \ && !defined(__EABI__) \ - && !defined(__VFP_FP__) + && !defined(__VFP_FP__) \ + && !defined(ANDROID) #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif @@ -524,6 +531,18 @@ #define HAVE_PTHREAD_RWLOCK 1 #endif +#if PLATFORM(ANDROID) +#define WTF_USE_PTHREADS 1 +#define WTF_PLATFORM_SGL 1 +#define USE_SYSTEM_MALLOC 1 +#define ENABLE_MAC_JAVA_BRIDGE 1 +#define LOG_DISABLED 1 +// Prevents Webkit from drawing the caret in textfields and textareas +// This prevents unnecessary invals. +#define ENABLE_TEXT_CARET 1 +#define ENABLE_JAVASCRIPT_DEBUGGER 0 +#endif + #if PLATFORM(WIN) #define WTF_USE_WININET 1 #endif @@ -559,7 +578,8 @@ #endif #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \ - && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) + && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) \ + && !PLATFORM(ANDROID) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 @@ -618,6 +638,16 @@ #define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_TIME_H 1 +#elif PLATFORM(ANDROID) + +#define HAVE_ERRNO_H 1 +#define HAVE_LANGINFO_H 0 +#define HAVE_MMAP 1 +#define HAVE_SBRK 1 +#define HAVE_STRINGS_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_TIME_H 1 + #else /* FIXME: is this actually used or do other platforms generate their own config.h? */ diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index cde6cd5b9793..71af48eb999a 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2009-11-19 Steve Block + + Reviewed by Darin Fisher. + + Android port lacks configuration in Platform.h and config.h. + https://bugs.webkit.org/show_bug.cgi?id=31671 + + Build change only. No new tests possible. + + * config.h: Modified. Added Android-specific configuration. + 2009-11-20 Roland Steiner Reviewed by Darin Adler. diff --git a/WebCore/config.h b/WebCore/config.h index 62a7f60a12ad..a880427cdcff 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -75,6 +75,34 @@ #endif /* PLATFORM(WIN_OS) */ +#if PLATFORM(ANDROID) +#define WEBCORE_NAVIGATOR_VENDOR "Google Inc." +// This must be defined before we include FastMalloc.h, below. +#define USE_SYSTEM_MALLOC 1 +#define LOG_DISABLED 1 +#include +// Central place to set which optional features Android uses. +#define ENABLE_CHANNEL_MESSAGING 1 +#define ENABLE_DOM_STORAGE 1 +#undef ENABLE_FTPDIR // Enabled by default in Platform.h +#define ENABLE_FTPDIR 0 +#ifndef ENABLE_SVG +#define ENABLE_SVG 0 +#endif +#define ENABLE_VIDEO 1 +#define ENABLE_WORKERS 1 +#define ENABLE_XBL 0 +#define ENABLE_XPATH 0 +#define ENABLE_XSLT 0 +#define ENABLE_ARCHIVE 0 +#define ENABLE_OFFLINE_WEB_APPLICATIONS 1 +#undef ENABLE_GEOLOCATION // Disabled by default in Platform.h +#define ENABLE_GEOLOCATION 1 +#undef ENABLE_INSPECTOR // Enabled by default in Platform.h +#define ENABLE_INSPECTOR 0 +#define ENABLE_EVENT_SOURCE 0 +#endif /* PLATFORM(ANDROID) */ + #ifdef __cplusplus // These undefs match up with defines in WebCorePrefix.h for Mac OS X. -- 2.36.0