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.
Bug: 2501254
Change-Id: Ideb86ce4c35efb7bc7595c4205dc1e8d5c1cf106
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 @@
// 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
