From 5fb15a120c24faef11e5952a791c5af38c54b07e Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Mon, 26 Apr 2010 00:08:57 -0700
Subject: Merge webkit.org at r58033 : Cherry-pick WebKit change 58061 to add
 Geolocation::suspend()/resume() back in

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

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

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

diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index b4e5bef..ba4f149 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -66,6 +66,10 @@ public:
     int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
     void clearWatch(int watchId);
 
+    // These methods are used by Android.
+    void suspend();
+    void resume();
+
     void setIsAllowed(bool);
     Frame* frame() const { return m_frame; }
 
-- 
cgit v1.1