diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-04 16:36:52 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-05 12:52:42 +0000 |
| commit | 508cafdf32b20f7ca242131f1de4e739179b1e48 (patch) | |
| tree | f67f4ca40ac95fcb73f66b5ddd4e9637345a35c4 | |
| parent | f94c2d711b15c9c4391729975f9ad5a7e05ea587 (diff) | |
| download | qtwebengine-chromium-508cafdf32b20f7ca242131f1de4e739179b1e48.tar.gz | |
FIXUP: Pass virtual url of data url request back to the UI
The common_params how now been moved at this point.
Change-Id: I95e29892ab9ba7cc199397e8d85c37a29fafd5d6
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/content/renderer/render_frame_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/content/renderer/render_frame_impl.cc b/chromium/content/renderer/render_frame_impl.cc index fc095ff631d..93627e59247 100644 --- a/chromium/content/renderer/render_frame_impl.cc +++ b/chromium/content/renderer/render_frame_impl.cc @@ -3890,6 +3890,12 @@ void RenderFrameImpl::CommitSameDocumentNavigation( InternalDocumentStateData::FromDocumentState(original_document_state)); // This is a browser-initiated same-document navigation (as opposed to a // fragment link click), therefore |was_initiated_in_this_frame| is false. + auto url = common_params->url; + if (!common_params->base_url_for_data_url.is_empty() && + !common_params->history_url_for_data_url.is_empty() && + common_params->url.SchemeIs(url::kDataScheme)) + url = common_params->history_url_for_data_url; + internal_data->set_navigation_state(NavigationState::CreateBrowserInitiated( std::move(common_params), std::move(commit_params), base::TimeTicks(), // Not used for same-document navigation. @@ -3897,12 +3903,6 @@ void RenderFrameImpl::CommitSameDocumentNavigation( mojom::NavigationClient::CommitNavigationCallback(), nullptr, false /* was_initiated_in_this_frame */)); - auto url = common_params->url; - if (!common_params->base_url_for_data_url.is_empty() && - !common_params->history_url_for_data_url.is_empty() && - common_params->url.SchemeIs(url::kDataScheme)) - url = common_params->history_url_for_data_url; - // Load the request. commit_status = frame_->CommitSameDocumentNavigation( url, load_type, item_for_history_navigation, is_client_redirect, |