diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /WebCore/page/Geolocation.h | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index af10632..a4a0c5a 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -139,6 +139,9 @@ private: void stopTimersForWatchers(); void stopTimers(); + void cancelRequests(Vector<RefPtr<GeoNotifier> >&); + void cancelAllRequests(); + void positionChangedInternal(); void makeSuccessCallbacks(); void handleError(PositionError*); @@ -148,6 +151,10 @@ private: bool startUpdating(GeoNotifier*); void stopUpdating(); +#if USE(PREEMPT_GEOLOCATION_PERMISSION) + void handlePendingPermissionNotifiers(); +#endif + #if !ENABLE(CLIENT_BASED_GEOLOCATION) && ENABLE(GEOLOCATION) // GeolocationServiceClient virtual void geolocationServicePositionChanged(GeolocationService*); @@ -171,7 +178,7 @@ private: OwnPtr<GeolocationService> m_service; #endif #if USE(PREEMPT_GEOLOCATION_PERMISSION) - RefPtr<GeoNotifier> m_startRequestPermissionNotifier; + GeoNotifierSet m_pendingForPermissionNotifiers; #endif RefPtr<Geoposition> m_lastPosition; |