diff options
| author | Steve Block <steveblock@google.com> | 2009-12-02 20:20:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 20:20:07 -0800 |
| commit | 8b6af12a5ceacdb3ab887398da1837bd0638630c (patch) | |
| tree | 9142425f8605f35d19f3550523273ce69a19c05a /WebCore/bindings/v8/V8Index.h | |
| parent | a47ab5294213cca2741f453b450b02666e08cac8 (diff) | |
| parent | 8845a2839cb6fb5d1c221fee655feb30a49e2ecb (diff) | |
| download | external_webkit-8b6af12a5ceacdb3ab887398da1837bd0638630c.zip external_webkit-8b6af12a5ceacdb3ab887398da1837bd0638630c.tar.gz external_webkit-8b6af12a5ceacdb3ab887398da1837bd0638630c.tar.bz2 | |
am 8845a283: am fb77ce99: Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Merge commit '8845a2839cb6fb5d1c221fee655feb30a49e2ecb'
* commit '8845a2839cb6fb5d1c221fee655feb30a49e2ecb':
Updates Geolocation V8 bindings to match patch submitted to webkit.org.
Diffstat (limited to 'WebCore/bindings/v8/V8Index.h')
| -rw-r--r-- | WebCore/bindings/v8/V8Index.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index 5478181..fb53948 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -491,15 +491,11 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #define DOM_OBJECT_INSPECTOR_TYPES(V) #endif -#if ENABLE(GEOLOCATION) #define DOM_OBJECT_GEOLOCATION_TYPES(V) \ V(COORDINATES, Coordinates) \ V(GEOLOCATION, Geolocation) \ V(GEOPOSITION, Geoposition) \ V(POSITIONERROR, PositionError) -#else -#define DOM_OBJECT_GEOLOCATION_TYPES(V) -#endif #if PLATFORM(ANDROID) // TODO: Upstream this guard. @@ -531,10 +527,10 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); DOM_OBJECT_3D_CANVAS_TYPES(V) \ DOM_OBJECT_XPATH_TYPES(V) \ DOM_OBJECT_XSLT_TYPES(V) \ + DOM_OBJECT_INSPECTOR_TYPES(V) \ DOM_OBJECT_GEOLOCATION_TYPES(V) \ DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ - DOM_OBJECT_VOIDCALLBACK_TYPES(V) \ - DOM_OBJECT_INSPECTOR_TYPES(V) + DOM_OBJECT_VOIDCALLBACK_TYPES(V) #endif #if ENABLE(SVG) |