Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public

See http://trac.webkit.org/changeset/53342

Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3

diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 5a9768c..231d57a 100644 (file)
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -495,14 +495,18 @@ void Geolocation::clearWatch(int watchId)
 
 void Geolocation::suspend()
 {
+#if !ENABLE(CLIENT_BASED_GEOLOCATION)
     if (hasListeners())
         m_service->suspend();
+#endif
 }
 
 void Geolocation::resume()
 {
+#if !ENABLE(CLIENT_BASED_GEOLOCATION)
     if (hasListeners())
         m_service->resume();
+#endif
 }
 
 void Geolocation::setIsAllowed(bool allowed)

diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 6249bc2..3006b29 100644 (file)
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -73,7 +73,7 @@ public:
 
     void suspend();
     void resume();
-    
+
     void setIsAllowed(bool);
     bool isAllowed() const { return m_allowGeolocation == Yes; }
     bool isDenied() const { return m_allowGeolocation == No; }