diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebCore/page/Geolocation.h | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 8803703..14aaac0 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -71,7 +71,7 @@ public: Frame* frame() const { return m_frame; } #if ENABLE(CLIENT_BASED_GEOLOCATION) - void setPosition(GeolocationPosition*); + void positionChanged(); void setError(GeolocationError*); #else GeolocationService* getGeolocationService() const { return m_service.get(); } @@ -128,13 +128,13 @@ private: void sendError(Vector<RefPtr<GeoNotifier> >&, PositionError*); void sendPosition(Vector<RefPtr<GeoNotifier> >&, Geoposition*); - + static void stopTimer(Vector<RefPtr<GeoNotifier> >&); void stopTimersForOneShots(); void stopTimersForWatchers(); void stopTimers(); - - void positionChanged(PassRefPtr<Geoposition>); + + void positionChangedInternal(); void makeSuccessCallbacks(); void handleError(PositionError*); |