diff options
| author | Steve Block <steveblock@google.com> | 2010-03-17 11:09:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-17 11:09:57 -0700 |
| commit | 02fe43bef497d2b2f8ca88b5d495374cf86ba11d (patch) | |
| tree | d32074b9aa7b7fa0e418f3fd96ee5500876dec8c | |
| parent | 252db18955bdb39a4d34b48cff9d1238a39745b9 (diff) | |
| parent | 68698168e7547cc10660828f1fb82be7a8efa845 (diff) | |
| download | external_webkit-02fe43bef497d2b2f8ca88b5d495374cf86ba11d.zip external_webkit-02fe43bef497d2b2f8ca88b5d495374cf86ba11d.tar.gz external_webkit-02fe43bef497d2b2f8ca88b5d495374cf86ba11d.tar.bz2 | |
Merge "Disable workers"
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/config.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index e336d23..380b138 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -49,7 +49,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 # CSS GEN := \ diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 29899ef..c385111 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -31,7 +31,7 @@ js_binding_scripts := \ $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_WORKERS=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 # CSS GEN := \ diff --git a/WebCore/config.h b/WebCore/config.h index 75bc3b6..702d244 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -85,7 +85,6 @@ #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 @@ -94,7 +93,6 @@ #endif #define ENABLE_3D_RENDERING 0 #define ENABLE_VIDEO 1 -#define ENABLE_WORKERS 1 #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) |