diff options
Diffstat (limited to 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 0db37e4..fc6365e 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -54,7 +54,11 @@ class GeolocationPosition; class GeolocationError; #endif +<<<<<<< HEAD class Geolocation : public EventListener +======= +class Geolocation : public RefCounted<Geolocation> +>>>>>>> webkit.org at r54127 #if !ENABLE(CLIENT_BASED_GEOLOCATION) , public GeolocationServiceClient #endif @@ -83,7 +87,11 @@ public: bool shouldClearCache() const { return m_shouldClearCache; } #if ENABLE(CLIENT_BASED_GEOLOCATION) +<<<<<<< HEAD void setPostion(GeolocationPosition*); +======= + void setPosition(GeolocationPosition*); +>>>>>>> webkit.org at r54127 void setError(GeolocationError*); #endif |