summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-12-18 02:15:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-18 02:15:04 -0800
commit5c8706a25612076fca97032bce1ba627f6ba618b (patch)
tree98b4e2e05fc8c51e0746f4cc274119f0f98bf4c3 /WebCore/platform
parent2427cd61fec29b72e27eb037ca0c6c57cb4ad66c (diff)
parent6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6 (diff)
downloadexternal_webkit-5c8706a25612076fca97032bce1ba627f6ba618b.zip
external_webkit-5c8706a25612076fca97032bce1ba627f6ba618b.tar.gz
external_webkit-5c8706a25612076fca97032bce1ba627f6ba618b.tar.bz2
am 6c4eb7eb: Merge change I49687314 into eclair-mr2
Merge commit '6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6' into eclair-mr2-plus-aosp * commit '6c4eb7eb3d9d196ca2c9b1589aa2d6d9924114b6': Fixes a Geolocation bug with cached positions.
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/android/GeolocationServiceAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index d44b3f0..43a8f5f 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -92,7 +92,7 @@ bool GeolocationServiceAndroid::startUpdating(PositionOptions* options)
void GeolocationServiceAndroid::stopUpdating()
{
// Called when the Geolocation object has no watches or one shots in
- // progress.
+ // progress. This may be called repeatedly.
m_javaBridge.clear();
// Reset last position and error to make sure that we always try to get a
// new position from the system service when a request is first made.