diff options
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index d9b23c4..f5e05a6 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -94,7 +94,10 @@ private: RefPtr<PositionOptions> m_options; Timer<GeoNotifier> m_timer; RefPtr<PositionError> m_fatalError; +<<<<<<< HEAD:WebCore/page/Geolocation.h RefPtr<Geoposition> m_cachedPosition; +======= +>>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h private: GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); @@ -136,10 +139,13 @@ private: PassRefPtr<GeoNotifier> startRequest(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); +<<<<<<< HEAD:WebCore/page/Geolocation.h // EventListener virtual bool operator==(const EventListener&); virtual void handleEvent(ScriptExecutionContext*, Event*); +======= +>>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h void fatalErrorOccurred(GeoNotifier*); void requestTimedOut(GeoNotifier*); void requestReturnedCachedPosition(GeoNotifier*); |