summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-09-16 19:57:24 +0100
committerBen Murdoch <benm@google.com>2009-09-16 19:57:24 +0100
commit1ae547307b95b4aac81c4061ee3afcc380f41d48 (patch)
tree05588a27e73142b97db2ecf7da035d1e8c6ba0c2 /WebCore
parent10d4052577e66430f5a3716ec51a401f1b4b21c2 (diff)
downloadexternal_webkit-1ae547307b95b4aac81c4061ee3afcc380f41d48.zip
external_webkit-1ae547307b95b4aac81c4061ee3afcc380f41d48.tar.gz
external_webkit-1ae547307b95b4aac81c4061ee3afcc380f41d48.tar.bz2
Enable Channgel Messaging for workers.
Change-Id: Iae69d02802dbe3d62e8d36753a8bed0ff9883db8
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/Android.derived.mk8
-rw-r--r--WebCore/config.h2
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