summaryrefslogtreecommitdiffstats
path: root/WebCore/page/Geolocation.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-01 12:39:36 +0000
committerSteve Block <steveblock@google.com>2010-02-01 13:17:47 +0000
commit23c22a60ec108914d8df8cd80023582fbedfe978 (patch)
treeea9fe94f39ddb281f88ca25e8bcd024def4eb9a2 /WebCore/page/Geolocation.h
parentdb217ef7ffee230d812f9da02a02d7d7bc696a8d (diff)
downloadexternal_webkit-23c22a60ec108914d8df8cd80023582fbedfe978.zip
external_webkit-23c22a60ec108914d8df8cd80023582fbedfe978.tar.gz
external_webkit-23c22a60ec108914d8df8cd80023582fbedfe978.tar.bz2
Cherry-pick WebKit change 54079 for client-based Geolocation
See http://trac.webkit.org/changeset/54079 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I46b8f439668768fa930c610d4b10c7e45cc1ca01
Diffstat (limited to 'WebCore/page/Geolocation.h')
-rw-r--r--WebCore/page/Geolocation.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 077a695..0db37e4 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -145,7 +145,7 @@ private:
void requestPermission();
- bool startUpdating(PositionOptions*);
+ bool startUpdating(GeoNotifier*);
void stopUpdating();
#if !ENABLE(CLIENT_BASED_GEOLOCATION)
@@ -173,6 +173,8 @@ private:
Frame* m_frame;
#if !ENABLE(CLIENT_BASED_GEOLOCATION)
OwnPtr<GeolocationService> m_service;
+#else
+ RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
#endif
RefPtr<Geoposition> m_lastPosition;
RefPtr<Geoposition> m_currentPosition;