content/renderer/render_frame_impl.cc - Issue 2037733002: PlzNavigate: fix RenderViewImplTest.OnNavigationHttpPost

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2037733002: PlzNavigate: fix RenderViewImplTest.OnNavigationHttpPost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/child/web_url_loader_impl.cc ('k') | testing/buildbot/filters/browser-side-navigation.linux.content_browsertests.filter » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 43c084df61361a7645cb4837ec10e978168f65b1..b1449a97bbdd2abb3cd28cce5e0944e47069991b 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -5490,12 +5490,11 @@ void RenderFrameImpl::NavigateInternal(

// Perform a navigation to a data url if needed.

// Note: the base URL might be invalid, so also check the data URL string.

- if (!common_params.base_url_for_data_url.is_empty() ||

+ bool should_load_data_url = !common_params.base_url_for_data_url.is_empty();

#if defined(OS_ANDROID)

- !request_params.data_url_as_string.empty() ||

+ should_load_data_url |= !request_params.data_url_as_string.empty();

#endif

- (browser_side_navigation &&

- common_params.url.SchemeIs(url::kDataScheme))) {

+ if (should_load_data_url) {

LoadDataURL(common_params, request_params, frame_, load_type,

item_for_history_navigation, history_load_type,

is_client_redirect);