diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 14:44:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
| commit | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (patch) | |
| tree | 01132a34552f1414cc645c5f8e87bb1ed8fe5714 /Source/JavaScriptCore | |
| parent | 15f1859ccdb0b25adc4607224a80c99b686fe0bb (diff) | |
| download | external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.zip external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.gz external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.bz2 | |
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
This replaces, and therefore conflicts with, Android's existing
ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the
upstream guard in WebCore, updates WebKit to use the new guard, and
enables this guard on Android.
See http://trac.webkit.org/changeset/78439
See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp
Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/wtf/Platform.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h index 18f481d..98eee7f 100644 --- a/Source/JavaScriptCore/wtf/Platform.h +++ b/Source/JavaScriptCore/wtf/Platform.h @@ -684,6 +684,7 @@ #if !defined(ENABLE_JIT) && !ENABLE(ANDROID_JSC_JIT) #define ENABLE_JIT 0 #endif +#define ENABLE_WEB_ARCHIVE 1 #endif #if PLATFORM(WIN) && !OS(WINCE) @@ -962,13 +963,6 @@ #define ENABLE_COMPOSITED_FIXED_ELEMENTS 0 #endif -// ENABLE_ARCHIVE is an Android addition. We need this default value to allow -// us to build on Mac. -// FIXME: Upstream to webkit.org. -#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 |