diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 23:37:57 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-03 12:56:24 +0000 |
| commit | c3383706d5fe846f5d60ab78e131cfd1e986e310 (patch) | |
| tree | c4679ead62e930dc5513ff74f733c49c5f621705 /WebCore | |
| parent | 3644bb8261d51f355ba21fe58f641b528febe812 (diff) | |
| download | external_webkit-c3383706d5fe846f5d60ab78e131cfd1e986e310.zip external_webkit-c3383706d5fe846f5d60ab78e131cfd1e986e310.tar.gz external_webkit-c3383706d5fe846f5d60ab78e131cfd1e986e310.tar.bz2 | |
Guard the new Navigator connection property with a temporary ENABLE_CONNECTION guard until it is upstreamed.
This is required to build Android WebKit for Mac.
The guard will be removed once the connection property is upstreamed.
Change-Id: I874e832b80dc682a49cae4df1fc6970283909ef3
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.jscbindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 2 | ||||
| -rw-r--r-- | WebCore/page/Navigator.idl | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index cc7ba28..1d7c722 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 +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 # CSS GEN := \ diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index e3bd4ca..44253eb 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 +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 # CSS GEN := \ diff --git a/WebCore/page/Navigator.idl b/WebCore/page/Navigator.idl index f3079de..168cf8c 100644 --- a/WebCore/page/Navigator.idl +++ b/WebCore/page/Navigator.idl @@ -39,8 +39,10 @@ module window { readonly attribute boolean onLine; +#if defined(ENABLE_CONNECTION) && ENABLE_CONNECTION // ANDROID-only for now, upstreaming in progress. readonly attribute Connection connection; +#endif #if defined(ENABLE_GEOLOCATION) && ENABLE_GEOLOCATION readonly attribute Geolocation geolocation; |