content/renderer/render_frame_impl.cc - Issue 1850123002: Rename WebFrameLoadType::ReloadFromOrigin to ReloadBypassingCache

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 1850123002: Rename WebFrameLoadType::ReloadFromOrigin to ReloadBypassingCache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

Index: content/renderer/render_frame_impl.cc

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

index eec93534377378818067220cd88fa46fddf7ab58..0935f11c8db44a285ae627e6d5ecda608293750c 100644

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

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

@@ -5307,7 +5307,7 @@ void RenderFrameImpl::NavigateInternal(

if (is_reload) {

bool ignore_cache = (common_params.navigation_type ==

FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE);

- load_type = ignore_cache ? blink::WebFrameLoadType::ReloadFromOrigin

+ load_type = ignore_cache ? blink::WebFrameLoadType::ReloadBypassingCache

: blink::WebFrameLoadType::Reload;

if (!browser_side_navigation) {

@@ -5682,7 +5682,7 @@ void RenderFrameImpl::LoadDataURL(

if (net::DataURL::Parse(data_url, &mime_type, &charset, &data)) {

const GURL base_url = params.base_url_for_data_url.is_empty() ?

params.url : params.base_url_for_data_url;

- bool replace = load_type == blink::WebFrameLoadType::ReloadFromOrigin ||

+ bool replace = load_type == blink::WebFrameLoadType::ReloadBypassingCache ||

load_type == blink::WebFrameLoadType::Reload;

frame->loadData(

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | third_party/WebKit/Source/core/inspector/InspectorPageAgent.h » ('J')