[ServiceWorker] Fix RenderFrameImpl::isControlledByServiceWorker()

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index fcea3a175e2bace23a8533186db30399b5920b30..b4c69d0fe41f39ef2340e3459a7bd7b5cc6957cd 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3181,12 +3181,13 @@ blink::WebScreenOrientationClient*
 bool RenderFrameImpl::isControlledByServiceWorker() {
   // If we're in the middle of committing a load, the data source we need
   // will still be provisional.
-  WebFrame* main_frame = render_view_->webview()->mainFrame();
+  if (!frame_)
+    return false;

[Mike West, 2014/09/30 06:17:31]

Can this ever be false?

[horo, 2014/09/30 06:55:59]

DCHECK(frame_) seems be better.

   WebDataSource* data_source = NULL;
-  if (main_frame->provisionalDataSource())
-    data_source = main_frame->provisionalDataSource();
+  if (frame_->provisionalDataSource())
+    data_source = frame_->provisionalDataSource();
   else
-    data_source = main_frame->dataSource();
+    data_source = frame_->dataSource();
   ServiceWorkerNetworkProvider* provider =
       ServiceWorkerNetworkProvider::FromDocumentState(
           DocumentState::FromDataSource(data_source));