diff options
| author | Steve Block <steveblock@google.com> | 2010-01-22 14:44:13 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-25 14:31:12 +0000 |
| commit | daee1033b2624ef1e03be35756ea75afaa7ea501 (patch) | |
| tree | 1e7b761d3476f6cd020db2967f0e75246457a8c6 /WebCore/page | |
| parent | e69f6aab4f5d93208365709a92a030adadecabf1 (diff) | |
| download | external_webkit-daee1033b2624ef1e03be35756ea75afaa7ea501.zip external_webkit-daee1033b2624ef1e03be35756ea75afaa7ea501.tar.gz external_webkit-daee1033b2624ef1e03be35756ea75afaa7ea501.tar.bz2 | |
Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public
See http://trac.webkit.org/changeset/53342
Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 4 | ||||
| -rw-r--r-- | WebCore/page/Geolocation.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 5a9768c..231d57a 100644 --- 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 --- 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; } |