diff options
author | Steve Block <steveblock@google.com> | 2012-05-15 15:40:11 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-05-22 14:17:24 +0100 |
commit | 46b2af401355ec7f5da6603268f6f08160ebc71b (patch) | |
tree | 1372994e879aa0fa2f42dbe97c78b32118c1fc43 /Source/WebCore/page | |
parent | dbdd2da378a2c3d2baf2524694cb6e25419f8818 (diff) | |
download | external_webkit-46b2af401355ec7f5da6603268f6f08160ebc71b.zip external_webkit-46b2af401355ec7f5da6603268f6f08160ebc71b.tar.gz external_webkit-46b2af401355ec7f5da6603268f6f08160ebc71b.tar.bz2 |
Remove the hacks used to suspend and resume the non-client-based Geolocation implementation
These forks to WebCore code are not required with the client-based
implementation, as we can suspend and resume the client directly.
Bug: 6511338
Change-Id: I7be5b4224555bc8c3893b75275ac3a997a6677d1
Diffstat (limited to 'Source/WebCore/page')
-rw-r--r-- | Source/WebCore/page/Geolocation.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Source/WebCore/page/Geolocation.cpp b/Source/WebCore/page/Geolocation.cpp index f0dd76a..352e06b 100644 --- a/Source/WebCore/page/Geolocation.cpp +++ b/Source/WebCore/page/Geolocation.cpp @@ -708,20 +708,8 @@ bool Geolocation::startUpdating(GeoNotifier* notifier) page->geolocationController()->addObserver(this, notifier->m_options->enableHighAccuracy()); return true; #else -#if PLATFORM(ANDROID) - // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082 - // Note that the correct fix is to use a 'paused' flag in WebCore, rather - // than calling into PlatformBridge. - if (!m_frame) - return false; - FrameView* view = m_frame->view(); - if (!view) - return false; - return m_service->startUpdating(notifier->m_options.get(), PlatformBridge::isWebViewPaused(view)); -#else return m_service->startUpdating(notifier->m_options.get()); #endif -#endif } void Geolocation::stopUpdating() |