equal
deleted
inserted
replaced
142 void requestPermission(); |
142 void requestPermission(); |
143 |
143 |
144 bool startUpdating(GeoNotifier*); |
144 bool startUpdating(GeoNotifier*); |
145 void stopUpdating(); |
145 void stopUpdating(); |
146 |
146 |
|
147 #if USE(PREEMPT_GEOLOCATION_PERMISSION) |
|
148 void handlePendingPermissionNotifiers(); |
|
149 #endif |
|
150 |
147 #if !ENABLE(CLIENT_BASED_GEOLOCATION) && ENABLE(GEOLOCATION) |
151 #if !ENABLE(CLIENT_BASED_GEOLOCATION) && ENABLE(GEOLOCATION) |
148 // GeolocationServiceClient |
152 // GeolocationServiceClient |
149 virtual void geolocationServicePositionChanged(GeolocationService*); |
153 virtual void geolocationServicePositionChanged(GeolocationService*); |
150 virtual void geolocationServiceErrorOccurred(GeolocationService*); |
154 virtual void geolocationServiceErrorOccurred(GeolocationService*); |
151 #endif |
155 #endif |
165 Frame* m_frame; |
169 Frame* m_frame; |
166 #if !ENABLE(CLIENT_BASED_GEOLOCATION) |
170 #if !ENABLE(CLIENT_BASED_GEOLOCATION) |
167 OwnPtr<GeolocationService> m_service; |
171 OwnPtr<GeolocationService> m_service; |
168 #endif |
172 #endif |
169 #if USE(PREEMPT_GEOLOCATION_PERMISSION) |
173 #if USE(PREEMPT_GEOLOCATION_PERMISSION) |
170 RefPtr<GeoNotifier> m_startRequestPermissionNotifier; |
174 GeoNotifierSet m_pendingForPermissionNotifiers; |
171 #endif |
175 #endif |
172 RefPtr<Geoposition> m_lastPosition; |
176 RefPtr<Geoposition> m_lastPosition; |
173 |
177 |
174 enum { |
178 enum { |
175 Unknown, |
179 Unknown, |