diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/page/Geolocation.h | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 5b3d156..9b3b43f 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -82,12 +82,8 @@ private: public: static PassRefPtr<GeoNotifier> create(Geolocation* geolocation, PassRefPtr<PositionCallback> positionCallback, PassRefPtr<PositionErrorCallback> positionErrorCallback, PassRefPtr<PositionOptions> options) { return adoptRef(new GeoNotifier(geolocation, positionCallback, positionErrorCallback, options)); } -<<<<<<< HEAD:WebCore/page/Geolocation.h void setFatalError(PassRefPtr<PositionError> error); void setCachedPosition(Geoposition* cachedPosition); -======= - bool hasZeroTimeout() const; ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h void startTimerIfNeeded(); void timerFired(Timer<GeoNotifier>*); @@ -100,22 +96,14 @@ private: RefPtr<Geoposition> m_cachedPosition; private: -<<<<<<< HEAD:WebCore/page/Geolocation.h GeoNotifier(Geolocation* geolocation, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); -======= - GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h }; bool hasListeners() const { return !m_oneShots.isEmpty() || !m_watchers.isEmpty(); } void sendError(Vector<RefPtr<GeoNotifier> >&, PositionError*); void sendPosition(Vector<RefPtr<GeoNotifier> >&, Geoposition*); -<<<<<<< HEAD:WebCore/page/Geolocation.h -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h static void stopTimer(Vector<RefPtr<GeoNotifier> >&); void stopTimersForOneShots(); void stopTimersForWatchers(); @@ -131,20 +119,13 @@ private: virtual void geolocationServicePositionChanged(GeolocationService*); virtual void geolocationServiceErrorOccurred(GeolocationService*); -<<<<<<< HEAD:WebCore/page/Geolocation.h // EventListener virtual void handleEvent(Event*, bool isWindowEvent); -======= -<<<<<<< HEAD:WebCore/page/Geolocation.h ->>>>>>> Merge webkit.org at R49305 : Automatic merge by git.:WebCore/page/Geolocation.h void fatalErrorOccurred(GeoNotifier* notifier); void requestTimedOut(GeoNotifier* notifier); void requestReturnedCachedPosition(GeoNotifier* notifier); bool haveSuitableCachedPosition(PositionOptions*); -======= - void requestTimedOut(GeoNotifier*); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h typedef HashSet<RefPtr<GeoNotifier> > GeoNotifierSet; typedef HashMap<int, RefPtr<GeoNotifier> > GeoNotifierMap; |