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

Unified Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 1310743003: Consistently use LoFi for an entire page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test fixes Created 5 years, 4 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/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 3543dc6299b322294b4c45eef9553e6de1779307..3e2b389c958bd178831e24c0d24941b07f1722ea 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -59,6 +59,7 @@
#include "content/browser/renderer_host/render_view_host_impl.h" // Temporary
#include "content/browser/site_instance_impl.h"
#include "content/common/frame_messages.h"
+#include "content/common/navigation_params.h"
#include "content/common/site_isolation_policy.h"
#include "content/common/ssl_status_serialization.h"
#include "content/common/view_messages.h"
@@ -1744,6 +1745,10 @@ bool NavigationControllerImpl::NavigateToPendingEntryInternal(
DCHECK(pending_entry_);
FrameTreeNode* root = delegate_->GetFrameTree()->root();
+ LoFiState lofi_state =
+ (reload_type == RELOAD_IGNORING_CACHE || reload_type == RELOAD ||
+ reload_type == RELOAD_ORIGINAL_REQUEST_URL) ? LOFI_OFF : LOFI_DEFAULT;
+
// In default Chrome, there are no subframe FrameNavigationEntries. Either
// navigate the main frame or use the main frame's FrameNavigationEntry to
// tell the indicated frame where to go.
@@ -1756,7 +1761,8 @@ bool NavigationControllerImpl::NavigateToPendingEntryInternal(
DCHECK(frame);
}
return frame->navigator()->NavigateToPendingEntry(frame, *frame_entry,
- reload_type, false);
+ reload_type, false,
+ lofi_state);
}
// In --site-per-process, we compare FrameNavigationEntries to see which
@@ -1786,12 +1792,14 @@ bool NavigationControllerImpl::NavigateToPendingEntryInternal(
for (const auto& item : same_document_loads) {
FrameTreeNode* frame = item.first;
success |= frame->navigator()->NavigateToPendingEntry(frame, *item.second,
- reload_type, true);
+ reload_type, true,
+ lofi_state);
}
for (const auto& item : different_document_loads) {
FrameTreeNode* frame = item.first;
success |= frame->navigator()->NavigateToPendingEntry(frame, *item.second,
- reload_type, false);
+ reload_type, false,
+ lofi_state);
}
return success;
}

Powered by Google App Engine
This is Rietveld 408576698