diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 12:05:15 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 12:05:15 -0400 |
| commit | 6613ce04263a3260e412ab09fedcfb41e523e28d (patch) | |
| tree | 7e97c861f2598d64c5863b4c60e35ea69b848723 | |
| parent | a3fb08910591707d5aa75e687f546abec6358fcc (diff) | |
| parent | 0056c410d854d219916a316c7a58508d6e985c3e (diff) | |
| download | external_webkit-6613ce04263a3260e412ab09fedcfb41e523e28d.zip external_webkit-6613ce04263a3260e412ab09fedcfb41e523e28d.tar.gz external_webkit-6613ce04263a3260e412ab09fedcfb41e523e28d.tar.bz2 | |
Merge change Ia667b47b into eclair-mr2
* changes:
Fix Geolocation service to use correct signature for Location.getAltitude().
| -rw-r--r-- | WebCore/platform/android/GeolocationServiceAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp index c4e9f0e..024877e 100644 --- a/WebCore/platform/android/GeolocationServiceAndroid.cpp +++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp @@ -151,7 +151,7 @@ PassRefPtr<Geoposition> GeolocationServiceBridge::convertLocationToGeoposition(J env->CallBooleanMethod(location, javaLocationClassMethodIDs[LOCATION_METHOD_HAS_ALTITUDE]); double altitude = hasAltitude ? - env->CallFloatMethod(location, javaLocationClassMethodIDs[LOCATION_METHOD_GET_ALTITUDE]) : + env->CallDoubleMethod(location, javaLocationClassMethodIDs[LOCATION_METHOD_GET_ALTITUDE]) : 0.0; // accuracy is required, but is not supplied by the emulator. double accuracy = |