diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-29 17:27:25 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-29 16:34:01 +0000 |
| commit | 323b45aa242e0b4e75689d67418ec124ba1ca815 (patch) | |
| tree | a30c4a699f1892d181e728f58738fc7aef408105 | |
| parent | e99d664a353120ba09f48cf28d4b169ad62e16d2 (diff) | |
FIXUP: Pass virtual url of data url request back to the UI
Only set virtual_url when it was a based on a load data request,
otherwise we will get wrong data for error pages.
Change-Id: Ie59b60de66990aa23016264e63b5dfdcd5198404
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/content/renderer/render_frame_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/content/renderer/render_frame_impl.cc b/chromium/content/renderer/render_frame_impl.cc index 035283ad488..5f0668682d8 100644 --- a/chromium/content/renderer/render_frame_impl.cc +++ b/chromium/content/renderer/render_frame_impl.cc @@ -5511,7 +5511,8 @@ RenderFrameImpl::MakeDidCommitProvisionalLoadParams( if (GURL(frame_document.BaseURL()) != params->url) params->base_url = frame_document.BaseURL(); - if (GURL(frame_document.Url()) != params->url) + if (document_state->was_load_data_with_base_url_request() && + GURL(frame_document.Url()) != params->url) params->virtual_url = frame_document.Url(); GetRedirectChain(document_loader, ¶ms->redirects); |