diff options
| author | Steve Block <steveblock@google.com> | 2012-05-21 18:46:12 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-05-22 14:17:23 +0100 |
| commit | b80d1c52ad334f34843b52138f0ea684f2683904 (patch) | |
| tree | f59653f9a5249f3f413a987693a9aa236c4695aa /Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h | |
| parent | 5c36c4ca9214cbbe65d12f6b138aef9618d41a99 (diff) | |
| download | external_webkit-b80d1c52ad334f34843b52138f0ea684f2683904.zip external_webkit-b80d1c52ad334f34843b52138f0ea684f2683904.tar.gz external_webkit-b80d1c52ad334f34843b52138f0ea684f2683904.tar.bz2 | |
Always call back to new Geolocation requests
This change makes sure we always call back to new Geolocation requests, even
when other requests are ongoing. Note that it requires an Android-specific
change to WebCore to fix https://bugs.webkit.org/show_bug.cgi?id=87030.
Bug: 6511338
Change-Id: If46d2ef0eb8e81925ae51ed2e8f2d16a9fa6c997
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h b/Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h index 81a6db3..26e6c0c 100644 --- a/Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h +++ b/Source/WebKit/android/WebCoreSupport/GeolocationClientImpl.h @@ -30,6 +30,7 @@ #include "GeolocationClient.h" #include "GeolocationPermissions.h" +#include <Timer.h> #include <wtf/OwnPtr.h> #include <wtf/RefPtr.h> @@ -68,12 +69,14 @@ public: private: GeolocationPermissions* permissions() const; + void timerFired(WebCore::Timer<GeolocationClientImpl>*); WebViewCore* m_webViewCore; RefPtr<WebCore::GeolocationPosition> m_lastPosition; RefPtr<WebCore::GeolocationError> m_lastError; OwnPtr<GeolocationServiceBridge> m_javaBridge; mutable OwnPtr<GeolocationPermissions> m_permissions; + WebCore::Timer<GeolocationClientImpl> m_timer; bool m_isSuspended; bool m_useGps; }; |