diff options
| author | Steve Block <steveblock@google.com> | 2010-03-10 09:19:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-10 09:19:11 -0800 |
| commit | 5d59fc68790cda4c64b9e13133704e8d9c94fe57 (patch) | |
| tree | 87c2a8e701373749e769864a55f284c87400719a /WebCore/page | |
| parent | af63f0d78dd59f396707681f28fe70ab300fcd8d (diff) | |
| parent | b9362877ccf9e5f8027f12898166d56518bbedb6 (diff) | |
| download | external_webkit-5d59fc68790cda4c64b9e13133704e8d9c94fe57.zip external_webkit-5d59fc68790cda4c64b9e13133704e8d9c94fe57.tar.gz external_webkit-5d59fc68790cda4c64b9e13133704e8d9c94fe57.tar.bz2 | |
Merge "When starting the Geolocation service, we need to make sure that we have a valid FrameView before querying the Java side to determine whether the WebView is paused."
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index faa8f86..d021f7b 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -650,7 +650,12 @@ bool Geolocation::startUpdating(GeoNotifier* notifier) // 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. - return m_service->startUpdating(notifier->m_options.get(), PlatformBridge::isWebViewPaused(m_frame->view())); + 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 |