Brings Mock Geolocation service up to date with latest submission to WebKit.

See https://bugs.webkit.org/show_bug.cgi?id=28264.

4 files changed, 8 insertions, 14 deletions

diff --git a/WebCore/platform/GeolocationService.cpp b/WebCore/platform/GeolocationService.cpp
index 454538e..4fd678b 100644
--- a/WebCore/platform/GeolocationService.cpp
+++ b/WebCore/platform/GeolocationService.cpp
@@ -48,16 +48,9 @@ GeolocationService* GeolocationService::create(GeolocationServiceClient* client)
     return (*s_factoryFunction)(client);
 }
 
-void GeolocationService::setMockPosition(PassRefPtr<Geoposition> position)
+void GeolocationService::useMock()
 {
     s_factoryFunction = &MockGeolocationService::create;
-    MockGeolocationService::setPosition(position);
-}
-
-void GeolocationService::setMockError(PassRefPtr<PositionError> error)
-{
-    s_factoryFunction = &MockGeolocationService::create;
-    MockGeolocationService::setError(error);
 }
 
 GeolocationService::GeolocationService(GeolocationServiceClient* client)
diff --git a/WebCore/platform/GeolocationService.h b/WebCore/platform/GeolocationService.h
index 3084aad..a99523f 100644
--- a/WebCore/platform/GeolocationService.h
+++ b/WebCore/platform/GeolocationService.h
@@ -60,8 +60,7 @@ public:
     void positionChanged();
     void errorOccurred();
 
-    static void setMockPosition(PassRefPtr<Geoposition>);
-    static void setMockError(PassRefPtr<PositionError>);
+    static void useMock();
 
 protected:
     GeolocationService(GeolocationServiceClient*);
diff --git a/WebCore/platform/MockGeolocationService.cpp b/WebCore/platform/MockGeolocationService.cpp
index 515bd97..72d85ef 100755
--- a/WebCore/platform/MockGeolocationService.cpp
+++ b/WebCore/platform/MockGeolocationService.cpp
@@ -60,6 +60,7 @@ MockGeolocationService::~MockGeolocationService()
 void MockGeolocationService::setPosition(PassRefPtr<Geoposition> position)
 {
     initStatics();
+    GeolocationService::useMock();
     *s_lastPosition = position;
     *s_lastError = 0;
     makeGeolocationCallbackFromAllInstances();
@@ -68,6 +69,7 @@ void MockGeolocationService::setPosition(PassRefPtr<Geoposition> position)
 void MockGeolocationService::setError(PassRefPtr<PositionError> error)
 {
     initStatics();
+    GeolocationService::useMock();
     *s_lastError = error;
     *s_lastPosition = 0;
     makeGeolocationCallbackFromAllInstances();
@@ -81,7 +83,7 @@ bool MockGeolocationService::startUpdating(PositionOptions*)
 
 void MockGeolocationService::timerFired(Timer<MockGeolocationService>* timer)
 {
-    if (timer != &m_timer) ASSERT(0);
+    ASSERT_UNUSED(timer, timer == &m_timer);
     makeGeolocationCallback();
 }
 
diff --git a/WebCore/platform/MockGeolocationService.h b/WebCore/platform/MockGeolocationService.h
index eb92cbc..2f190e6 100755
--- a/WebCore/platform/MockGeolocationService.h
+++ b/WebCore/platform/MockGeolocationService.h
@@ -63,12 +63,12 @@ class MockGeolocationService : public GeolocationService {
     static void initStatics();
     static void cleanUpStatics();
 
-    static RefPtr<Geoposition>* s_lastPosition;
-    static RefPtr<PositionError>* s_lastError;
-
     typedef HashSet<MockGeolocationService*> MockGeolocationServiceSet;
     static MockGeolocationServiceSet* s_instances;
 
+    static RefPtr<Geoposition>* s_lastPosition;
+    static RefPtr<PositionError>* s_lastError;
+
     Timer<MockGeolocationService> m_timer;
 };