diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc b/chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc index 01feb648342..6d296c859f8 100644 --- a/chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc +++ b/chromium/third_party/blink/renderer/core/loader/resource_load_observer_for_frame.cc @@ -133,7 +133,7 @@ void ResourceLoadObserverForFrame::DidReceiveResponse( if (response_source == ResponseSource::kFromMemoryCache) { frame_client->DispatchDidLoadResourceFromMemoryCache( - resource->GetResourceRequest(), response); + ResourceRequest(resource->GetResourceRequest()), response); // Note: probe::WillSendRequest needs to precede before this probe method. probe::MarkResourceAsCached(&frame, &document_loader, identifier); @@ -172,8 +172,8 @@ void ResourceLoadObserverForFrame::DidReceiveResponse( response.HttpHeaderField(http_names::kLink), response.CurrentRequestUrl(), frame, &frame_or_imported_document_->GetDocument(), resource_loading_policy, PreloadHelper::kLoadAll, - base::nullopt /* viewport_description */, - std::move(alternate_resource_info), response.RecursivePrefetchToken()); + nullptr /* viewport_description */, std::move(alternate_resource_info), + base::OptionalOrNullptr(response.RecursivePrefetchToken())); if (response.HasMajorCertificateErrors()) { MixedContentChecker::HandleCertificateError(&frame, response, |