2 files changed, 15 insertions, 2 deletions
diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
index 43a8f5f..3ffb9b9 100644
--- a/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -28,6 +28,7 @@
 
 #include "GeolocationServiceBridge.h"
 #include "Geoposition.h"
+#include "PlatformBridge.h"
 #include "PositionError.h"
 #include "PositionOptions.h"
 
@@ -83,8 +84,13 @@ bool GeolocationServiceAndroid::startUpdating(PositionOptions* options)
     if (options->enableHighAccuracy())
         m_javaBridge->setEnableGps(true);
 
-    if (!haveJavaBridge)
-        m_javaBridge->start();
+    // We need only start the service when it's first created.
+    if (!haveJavaBridge) {
+        // If the browser is paused, don't start the service. It will be started
+        // when we get the call to resume.
+        if (!PlatformBridge::isWebViewPaused())
+            m_javaBridge->start();
+    }
 
     return true;
 }
diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index 9adb314..a73abab 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -50,6 +50,10 @@ public:
     // KeyGenerator
     static WTF::Vector<String> getSupportedKeyStrengthList();
     static String getSignedPublicKeyAndChallengeString(unsigned index, const String& challenge, const KURL&);
+    // Cookies
+    static void setCookies(const KURL&, const String& value);
+    static String cookies(const KURL&);
+    static bool cookiesEnabled();
     // These ids need to be in sync with the constants in BrowserFrame.java
     enum rawResId {
         NoDomain = 1,
@@ -67,6 +71,9 @@ public:
     static void immediateRepaint(const FrameView* view);
 #endif // USE(ACCELERATED_COMPOSITING)
 
+    // Whether the WebView is paused.
+    static bool isWebViewPaused();
 };
+
 }
 #endif // PlatformBridge_h