| 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..b65e764571fed8564c48dadd6449fae1da59da9a 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -3181,12 +3181,12 @@ 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();
|
| + DCHECK(frame_);
|
| 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));
|
|
|