diff options
| author | Steve Block <steveblock@google.com> | 2010-01-25 10:10:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-25 10:10:04 -0800 |
| commit | fc4f8486a2f2be92cdd4811c86aa9ee0a49ee576 (patch) | |
| tree | f4b067956dc25f32a86b311307876de5dee1734e /WebCore/page/GeolocationController.cpp | |
| parent | ae1b04df679593f44b55779daac6ef70fc0ff8d0 (diff) | |
| parent | 1c58588a98d412c23d74caf92991904fddbc9d49 (diff) | |
| download | external_webkit-fc4f8486a2f2be92cdd4811c86aa9ee0a49ee576.zip external_webkit-fc4f8486a2f2be92cdd4811c86aa9ee0a49ee576.tar.gz external_webkit-fc4f8486a2f2be92cdd4811c86aa9ee0a49ee576.tar.bz2 | |
Merge changes Ib69ddd4d,Ib28c69a6,I342b9f6b
* changes:
Cherry-pick WebKit change 53441 to make changes to Geolocation
Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public
Cherry-pick WebKit change 52104 to make changes to Geolocation
Diffstat (limited to 'WebCore/page/GeolocationController.cpp')
| -rw-r--r-- | WebCore/page/GeolocationController.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/page/GeolocationController.cpp b/WebCore/page/GeolocationController.cpp index 44eba6e..968e854 100644 --- a/WebCore/page/GeolocationController.cpp +++ b/WebCore/page/GeolocationController.cpp @@ -54,7 +54,8 @@ void GeolocationController::addObserver(Geolocation* observer) void GeolocationController::removeObserver(Geolocation* observer) { - ASSERT(m_observers.contains(observer)); + if (!m_observers.contains(observer)) + return; m_observers.remove(observer); if (m_observers.isEmpty()) |