summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 12:56:53 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 12:56:53 +0000
commit1597bafcf13b29051d16debae1d561b385550572 (patch)
treee53bfca99ab87a0731f007452f7b5476dac0b52b /chrome/renderer
parentaa1e4c323ff0ed9bd878d1369275c6cde9c5448a (diff)
downloadchromium_src-1597bafcf13b29051d16debae1d561b385550572.zip
chromium_src-1597bafcf13b29051d16debae1d561b385550572.tar.gz
chromium_src-1597bafcf13b29051d16debae1d561b385550572.tar.bz2
Discard geolocation update if dispatcher is not updating.
BUG=69258 TEST=None Review URL: http://codereview.chromium.org/6196004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/geolocation_dispatcher.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/renderer/geolocation_dispatcher.cc b/chrome/renderer/geolocation_dispatcher.cc
index e944673..aefc346 100644
--- a/chrome/renderer/geolocation_dispatcher.cc
+++ b/chrome/renderer/geolocation_dispatcher.cc
@@ -113,7 +113,11 @@ void GeolocationDispatcher::OnGeolocationPermissionSet(
// We have an updated geolocation position or error code.
void GeolocationDispatcher::OnGeolocationPositionUpdated(
const Geoposition& geoposition) {
- DCHECK(updating_);
+ // It is possible for the browser process to have queued an update message
+ // before receiving the stop updating message.
+ if (!updating_)
+ return;
+
DCHECK(geoposition.IsInitialized());
if (geoposition.IsValidFix()) {
controller_->positionChanged(