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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2910783002: Adds Lo-Fi fallback support for new Data Reduction Proxy protocol. (Closed)
Patch Set: Makes SlowConnection integration test more permissive in which type of server optimization response… Created 3 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c36999d9a0e188092a453ed1402ea42d7f5b6921..8a1db80f92b4b7124174be17bd617f3071b5e4cf 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -131,6 +131,7 @@
#include "content/renderer/pepper/pepper_audio_controller.h"
#include "content/renderer/pepper/plugin_instance_throttler_impl.h"
#include "content/renderer/presentation/presentation_dispatcher.h"
+#include "content/renderer/previews_state_helper.h"
#include "content/renderer/push_messaging/push_messaging_client.h"
#include "content/renderer/render_frame_proxy.h"
#include "content/renderer/render_process.h"
@@ -3583,10 +3584,10 @@ void RenderFrameImpl::DidCommitProvisionalLoad(
// main frame documents. Subframes inherit from the main frame and should not
// change at commit time.
if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) {
- previews_state_ =
- extra_data ? extra_data->previews_state() : PREVIEWS_OFF;
-
+ previews_state_ = PREVIEWS_OFF;
if (extra_data) {
+ previews_state_ = UpdatePreviewsStateFromMainFrameResponse(
+ extra_data->previews_state(), web_url_response);
effective_connection_type_ =
EffectiveConnectionTypeToWebEffectiveConnectionType(
extra_data->effective_connection_type());
@@ -4012,8 +4013,7 @@ bool RenderFrameImpl::ShouldUseClientLoFiForRequest(
if (!(previews_state_ & CLIENT_LOFI_ON))
return false;
- if (previews_state_ &
- (SERVER_LITE_PAGE_ON | PREVIEWS_OFF | PREVIEWS_NO_TRANSFORM)) {
+ if (previews_state_ & (PREVIEWS_OFF | PREVIEWS_NO_TRANSFORM)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698