diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/page/GeolocationController.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/page/GeolocationController.cpp')
| -rw-r--r-- | Source/WebCore/page/GeolocationController.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/page/GeolocationController.cpp b/Source/WebCore/page/GeolocationController.cpp index 28d522d..764b913 100644 --- a/Source/WebCore/page/GeolocationController.cpp +++ b/Source/WebCore/page/GeolocationController.cpp @@ -41,8 +41,12 @@ GeolocationController::GeolocationController(Page* page, GeolocationClient* clie GeolocationController::~GeolocationController() { - if (m_client) + if (m_client) { + if (!m_observers.isEmpty()) + m_client->stopUpdating(); + m_client->geolocationDestroyed(); + } } void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy) |