Merge change 23969 into eclair

* changes:
  Updates MockGeolocationService to call back to the Geolocation object only when active.

2 files changed, 13 insertions, 0 deletions

diff --git a/WebCore/platform/MockGeolocationService.cpp b/WebCore/platform/MockGeolocationService.cpp
index 72d85ef..b147f53 100755
--- a/WebCore/platform/MockGeolocationService.cpp
+++ b/WebCore/platform/MockGeolocationService.cpp
@@ -45,6 +45,7 @@ GeolocationService* MockGeolocationService::create(GeolocationServiceClient* cli
 MockGeolocationService::MockGeolocationService(GeolocationServiceClient* client)
     : GeolocationService(client)
     , m_timer(this, &MockGeolocationService::timerFired)
+    , m_isActive(false)
 {
     s_instances->add(this);
 }
@@ -77,10 +78,16 @@ void MockGeolocationService::setError(PassRefPtr<PositionError> error)
 
 bool MockGeolocationService::startUpdating(PositionOptions*)
 {
+    m_isActive = true;
     m_timer.startOneShot(0);
     return true;
 }
 
+void MockGeolocationService::stopUpdating()
+{
+    m_isActive = false;
+}
+
 void MockGeolocationService::timerFired(Timer<MockGeolocationService>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timer);
@@ -99,6 +106,9 @@ void MockGeolocationService::makeGeolocationCallbackFromAllInstances()
 
 void MockGeolocationService::makeGeolocationCallback()
 {
+    if (!m_isActive)
+        return;
+
     if (*s_lastPosition) {
         positionChanged();
     } else if (*s_lastError) {
diff --git a/WebCore/platform/MockGeolocationService.h b/WebCore/platform/MockGeolocationService.h
index 2f190e6..6cb2493 100755
--- a/WebCore/platform/MockGeolocationService.h
+++ b/WebCore/platform/MockGeolocationService.h
@@ -47,6 +47,7 @@ class MockGeolocationService : public GeolocationService {
     virtual ~MockGeolocationService();
 
     virtual bool startUpdating(PositionOptions*);
+    virtual void stopUpdating();
 
     static void setPosition(PassRefPtr<Geoposition> position);
     static void setError(PassRefPtr<PositionError> position);
@@ -70,6 +71,8 @@ class MockGeolocationService : public GeolocationService {
     static RefPtr<PositionError>* s_lastError;
 
     Timer<MockGeolocationService> m_timer;
+
+    bool m_isActive;
 };
 
 } // namespace WebCore