diff options
| author | Steve Block <steveblock@google.com> | 2009-11-19 16:49:23 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-20 11:13:44 +0000 |
| commit | 2cc706295f906df0bb49f51c9efe92a97c427464 (patch) | |
| tree | 74e21bbcb0264b6c0a3feb1095d97d1b94ef0c2d | |
| parent | 16cdc1c75e84e6c6fed91095d72520f4cc5b5237 (diff) | |
| download | external_webkit-2cc706295f906df0bb49f51c9efe92a97c427464.zip external_webkit-2cc706295f906df0bb49f51c9efe92a97c427464.tar.gz external_webkit-2cc706295f906df0bb49f51c9efe92a97c427464.tar.bz2 | |
Updates WebCore/config.h to reflect changes made when upstreaming to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=31671
Note that we only need to undef a feature enable flag when we are overwriting a default value previosuly set
in Platform.h. Also, we now rely on the default value for ENABLE_DATABASE.
Change-Id: I26ca5ef5402609ead880bdd1ce05cdb3646c1bbc
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 5 | ||||
| -rw-r--r-- | WebCore/config.h | 22 |
2 files changed, 7 insertions, 20 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index df05811..92ab043 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -728,11 +728,6 @@ #define ENABLE_TEXT_CARET 1 #endif -// ANDROID addition: allow web archive to be disabled -#if !defined(ENABLE_ARCHIVE) -#define ENABLE_ARCHIVE 1 -#endif - #if !defined(ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) #define ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL 0 #endif diff --git a/WebCore/config.h b/WebCore/config.h index 9aa9fbb..f4b93c5 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -76,28 +76,22 @@ #endif /* PLATFORM(WIN_OS) */ // ANDROID def should be after all PLATFORM to avoid override. -// USE_SYSTEM_MALLOC needs to be defined before include FastMalloc.h #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 ANDROID_MOBILE // change can be merged back to WebKit.org for MOBILE #define LOG_DISABLED 1 #include <wtf/Assertions.h> -// center place to handle which option feature ANDROID will enable -#undef ENABLE_CHANNEL_MESSAGING +// Central place to set which optional features Android uses. #define ENABLE_CHANNEL_MESSAGING 1 -#undef ENABLE_DATABASE -#define ENABLE_DATABASE 1 -#undef ENABLE_DOM_STORAGE #define ENABLE_DOM_STORAGE 1 -#undef ENABLE_FTPDIR +#undef ENABLE_FTPDIR // Enabled by default in Platform.h #define ENABLE_FTPDIR 0 #ifndef ENABLE_SVG #define ENABLE_SVG 0 #endif -#undef ENABLE_VIDEO #define ENABLE_VIDEO 1 -#undef ENABLE_WORKERS #define ENABLE_WORKERS 1 #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) @@ -116,15 +110,13 @@ #define ENABLE_XPATH 0 #define ENABLE_XSLT 0 -#undef ENABLE_ARCHIVE -#define ENABLE_ARCHIVE 0 // ANDROID addition: allow web archive to be disabled +#define ENABLE_ARCHIVE 0 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 #define ENABLE_TOUCH_EVENTS 1 -#undef ENABLE_GEOLOCATION +#undef ENABLE_GEOLOCATION // Disabled by default in Platform.h #define ENABLE_GEOLOCATION 1 -#undef ENABLE_INSPECTOR +#undef ENABLE_INSPECTOR // Enabled by default in Platform.h #define ENABLE_INSPECTOR 0 -#undef ENABLE_EVENT_SOURCE #define ENABLE_EVENT_SOURCE 0 #define FLATTEN_FRAMESET @@ -197,7 +189,7 @@ // or if javascript tried to change the location. #define ANDROID_USER_GESTURE -#endif // PLATFORM(ANDROID) +#endif /* PLATFORM(ANDROID) */ #ifdef __cplusplus |