Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1316)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2583123002: Reload: FrameMsg_Navigate_Type cleanup to rename RELOAD_MAIN_RESOURCE (Closed)
Patch Set: replace logic update Created 3 years, 11 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/common/frame_message_enums.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 120d55863df289c3d50cb2dcb642b2302a31b5b3..f38051497d1dac5ac1f0109df5fdddaaee97a9b7 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -655,7 +655,6 @@ media::Context3D GetSharedMainThreadContext3D(
bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
switch (navigation_type) {
case FrameMsg_Navigate_Type::RELOAD:
- case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
return true;
@@ -673,8 +672,6 @@ WebFrameLoadType ReloadFrameLoadTypeFor(
switch (navigation_type) {
case FrameMsg_Navigate_Type::RELOAD:
case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
- return WebFrameLoadType::Reload;
- case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
return WebFrameLoadType::ReloadMainResource;
case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
return WebFrameLoadType::ReloadBypassingCache;
@@ -6272,6 +6269,7 @@ void RenderFrameImpl::LoadDataURL(
const GURL base_url = params.base_url_for_data_url.is_empty() ?
params.url : params.base_url_for_data_url;
bool replace = load_type == WebFrameLoadType::ReloadBypassingCache ||
+ load_type == WebFrameLoadType::ReloadMainResource ||
load_type == WebFrameLoadType::Reload;
frame->loadData(
« no previous file with comments | « content/common/frame_message_enums.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698