[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:51:10 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit b8ec05af59476ecc9077d6c8855af7da78d1e912
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 20 06:03:15 2009 +0000
2009-11-19 Steve Block <steveblock at google.com>
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 <steveblock at google.com>
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: http://svn.webkit.org/repository/webkit/trunk@51228 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8e585b1..fcb51d8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-19 Steve Block <steveblock at google.com>
+
+ 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 <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 99a47bf..d3a4077 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 cde6cd5..71af48e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-19 Steve Block <steveblock at google.com>
+
+ 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 <rolandsteiner at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/config.h b/WebCore/config.h
index 62a7f60..a880427 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 <wtf/Assertions.h>
+// 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.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list