diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 09:55:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 09:55:28 -0800 |
| commit | 4dd98cc27e25e6c3104672f50749132d2236461b (patch) | |
| tree | 01f4412526c81ec62e02d71d128ec45827a12fdc /WebCore/config.h | |
| parent | fadf964da75468c2c995316cea8d82d32705a7e1 (diff) | |
| parent | aad6f24e036b3740071bb995b955b18b572067b2 (diff) | |
| download | external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.zip external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.gz external_webkit-4dd98cc27e25e6c3104672f50749132d2236461b.tar.bz2 | |
am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit 'aad6f24e036b3740071bb995b955b18b572067b2' into eclair-mr2-plus-aosp
* commit 'aad6f24e036b3740071bb995b955b18b572067b2':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'WebCore/config.h')
| -rw-r--r-- | WebCore/config.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 31b4c17..907b0d5 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -75,18 +75,12 @@ #endif /* PLATFORM(WIN_OS) */ -<<<<<<< HEAD:WebCore/config.h // ANDROID def should be after all PLATFORM to avoid override. -======= ->>>>>>> webkit.org at r51976:WebCore/config.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 -<<<<<<< HEAD:WebCore/config.h #define ANDROID_MOBILE // change can be merged back to WebKit.org for MOBILE -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #define LOG_DISABLED 1 #include <wtf/Assertions.h> // Central place to set which optional features Android uses. @@ -99,7 +93,7 @@ #endif #define ENABLE_VIDEO 1 #define ENABLE_WORKERS 1 -<<<<<<< HEAD:WebCore/config.h + #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) #define ENABLE_SVG_ANIMATION 0 // to enable: @@ -113,28 +107,19 @@ #define ENABLE_SVG_FOREIGN_OBJECT 1 #define ENABLE_SVG_USE 1 #endif -======= ->>>>>>> webkit.org at r51976:WebCore/config.h + #define ENABLE_XBL 0 #define ENABLE_XPATH 0 #define ENABLE_XSLT 0 -<<<<<<< HEAD:WebCore/config.h - #undef ENABLE_ARCHIVE // Enabled by default in Platform.h -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #define ENABLE_ARCHIVE 0 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 -<<<<<<< HEAD:WebCore/config.h #define ENABLE_TOUCH_EVENTS 1 -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #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 -<<<<<<< HEAD:WebCore/config.h #define FLATTEN_FRAMESET #define FLATTEN_IFRAME @@ -211,8 +196,6 @@ // a page is cached. Invoke loadEvent when a page is restored. #define ANDROID_PAGE_CACHE_UNLOAD -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #endif /* PLATFORM(ANDROID) */ #ifdef __cplusplus |