--- a/WebCore/page/Geolocation.h Fri Sep 17 09:02:29 2010 +0300
+++ b/WebCore/page/Geolocation.h Mon Oct 04 01:32:07 2010 +0300
@@ -144,6 +144,10 @@
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*);
@@ -167,7 +171,7 @@
OwnPtr<GeolocationService> m_service;
#endif
#if USE(PREEMPT_GEOLOCATION_PERMISSION)
- RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
+ GeoNotifierSet m_pendingForPermissionNotifiers;
#endif
RefPtr<Geoposition> m_lastPosition;