diff options
| author | Steve Block <steveblock@google.com> | 2010-02-03 05:22:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-03 05:22:54 -0800 |
| commit | 52d25f0b47a8bb2c38de3a8429316221f742b8f9 (patch) | |
| tree | c4679ead62e930dc5513ff74f733c49c5f621705 | |
| parent | 4e5b9ab15a2e17baef5dcbae60c5b3e54777a821 (diff) | |
| parent | c3383706d5fe846f5d60ab78e131cfd1e986e310 (diff) | |
| download | external_webkit-52d25f0b47a8bb2c38de3a8429316221f742b8f9.zip external_webkit-52d25f0b47a8bb2c38de3a8429316221f742b8f9.tar.gz external_webkit-52d25f0b47a8bb2c38de3a8429316221f742b8f9.tar.bz2 | |
Merge "Guard the new Navigator connection property with a temporary ENABLE_CONNECTION guard until it is upstreamed."
| -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; |