diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 05:47:21 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 05:47:21 -0400 |
| commit | bc6b2da0df432c910e5423406a1b7834591d4f6e (patch) | |
| tree | 83ea3562b176b45ed7376fb5658acdff062068b3 /WebCore | |
| parent | 2dfa40e5ed41a783615f2a7e81e82f7d1a4bd517 (diff) | |
| parent | 1ae547307b95b4aac81c4061ee3afcc380f41d48 (diff) | |
| download | external_webkit-bc6b2da0df432c910e5423406a1b7834591d4f6e.zip external_webkit-bc6b2da0df432c910e5423406a1b7834591d4f6e.tar.gz external_webkit-bc6b2da0df432c910e5423406a1b7834591d4f6e.tar.bz2 | |
Merge change 25316 into eclair
* changes:
Enable Channgel Messaging for workers.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.mk | 8 | ||||
| -rw-r--r-- | WebCore/config.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 98a03d7..c505908 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -209,7 +209,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) -FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT 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 +FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT 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 GEN := \ $(intermediates)/css/JSCSSCharsetRule.h \ @@ -261,8 +261,8 @@ GEN := \ $(intermediates)/dom/JSAttr.h \ $(intermediates)/dom/JSCDATASection.h \ $(intermediates)/dom/JSCharacterData.h \ - $(intermediates)/dom/JSClientRect.h \ - $(intermediates)/dom/JSClientRectList.h \ + $(intermediates)/dom/JSClientRect.h \ + $(intermediates)/dom/JSClientRectList.h \ $(intermediates)/dom/JSClipboard.h \ $(intermediates)/dom/JSComment.h \ $(intermediates)/dom/JSDOMCoreException.h \ @@ -288,7 +288,7 @@ GEN := \ $(intermediates)/dom/JSNodeIterator.h \ $(intermediates)/dom/JSNodeList.h \ $(intermediates)/dom/JSNotation.h \ - $(intermediates)/dom/JSOverflowEvent.h \ + $(intermediates)/dom/JSOverflowEvent.h \ $(intermediates)/dom/JSProcessingInstruction.h \ $(intermediates)/dom/JSProgressEvent.h \ $(intermediates)/dom/JSRange.h \ diff --git a/WebCore/config.h b/WebCore/config.h index a9fa934..f89dc77 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -95,6 +95,8 @@ #define LOG_DISABLED 1 #include <wtf/Assertions.h> // center place to handle which option feature ANDROID will enable +#undef ENABLE_CHANNEL_MESSAGING +#define ENABLE_CHANNEL_MESSAGING 1 #undef ENABLE_DATABASE #define ENABLE_DATABASE 1 #undef ENABLE_DOM_STORAGE |