From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 2 Feb 2010 14:57:50 +0000
Subject: Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
---
 WebCore/page/Geolocation.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'WebCore/page/Geolocation.h')

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
 
-- 
cgit v1.1