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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2772753002: Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior (Closed)
Patch Set: rebase error fix (replace newly added ReloadMainResource) Created 3 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
« no previous file with comments | « chrome/renderer/net/net_error_helper.cc ('k') | third_party/WebKit/Source/core/frame/History.cpp » ('j') | 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 6a0abc7ac40fb115b619ba3fc13e8feeef8eedf5..219ac9203ae66d78f0f5db40e8b80ef885ff87f7 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -718,7 +718,7 @@ WebFrameLoadType ReloadFrameLoadTypeFor(
switch (navigation_type) {
case FrameMsg_Navigate_Type::RELOAD:
case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
- return WebFrameLoadType::ReloadMainResource;
+ return WebFrameLoadType::Reload;
case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
return WebFrameLoadType::ReloadBypassingCache;
@@ -2297,7 +2297,7 @@ void RenderFrameImpl::OnPostMessageEvent(
void RenderFrameImpl::OnReload(bool bypass_cache) {
frame_->reload(bypass_cache ? WebFrameLoadType::ReloadBypassingCache
- : WebFrameLoadType::ReloadMainResource);
+ : WebFrameLoadType::Reload);
}
void RenderFrameImpl::OnReloadLoFiImages() {
@@ -6456,7 +6456,6 @@ 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 | « chrome/renderer/net/net_error_helper.cc ('k') | third_party/WebKit/Source/core/frame/History.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698