diff options
author | Steve Block <steveblock@google.com> | 2010-01-12 20:30:31 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-01-12 20:57:36 +0000 |
commit | fb651c68fc3c15b61a70f200fd98cf32b01c174d (patch) | |
tree | 1eb710f1783188f418ca26129c5039153647947f /WebCore | |
parent | c4c0128707c7c8818db4a0922fdd8a05d0ca55e6 (diff) | |
parent | e0286f6669308d19556bab47276d44eb1e67055f (diff) | |
download | external_webkit-fb651c68fc3c15b61a70f200fd98cf32b01c174d.zip external_webkit-fb651c68fc3c15b61a70f200fd98cf32b01c174d.tar.gz external_webkit-fb651c68fc3c15b61a70f200fd98cf32b01c174d.tar.bz2 |
resolved conflicts for merge of e0286f66 to master
Change-Id: I6efcacf082170506048d0a2caf3d669796fc4253
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/platform/android/GeolocationServiceAndroid.cpp | 10 | ||||
-rw-r--r-- | WebCore/platform/android/PlatformBridge.h | 2 |
2 files changed, 10 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 a1ed50a..a73abab 100644 --- a/WebCore/platform/android/PlatformBridge.h +++ b/WebCore/platform/android/PlatformBridge.h @@ -71,6 +71,8 @@ public: static void immediateRepaint(const FrameView* view); #endif // USE(ACCELERATED_COMPOSITING) + // Whether the WebView is paused. + static bool isWebViewPaused(); }; } |