Added support for heavy page previews transformations

components/data_reduction_proxy/content/browser/content_lofi_decider.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/content/browser/content_lofi_decider.h"
 
 #include <string>
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 
 namespace data_reduction_proxy {
 
 ContentLoFiDecider::ContentLoFiDecider() {}
@@ skipping 17 matching lines @@
 
 void ContentLoFiDecider::MaybeSetAcceptTransformHeader(
     const net::URLRequest& request,
     net::HttpRequestHeaders* headers) const {
   const content::ResourceRequestInfo* request_info =
       content::ResourceRequestInfo::ForRequest(&request);
 
   if (!request_info)
     return;
 
-  content::ResourceType resource_type = request_info->GetResourceType();
-
-  // The Lo-Fi and Lite Page directives should not be added for users in the
-  // Lo-Fi field trial "Control" group.
-  bool lofi_enabled_via_flag_or_field_trial =
-      params::IsLoFiOnViaFlags() || params::IsIncludedInLoFiEnabledFieldTrial();
-
-  bool lite_page_via_flag_or_field_trial =
-      params::AreLitePagesEnabledViaFlags() ||
-      params::IsIncludedInLitePageFieldTrial();
-
   // Previews only operate on HTTP.
   if (!request.url().SchemeIs("http"))
     return;
 
   // Chrome-Proxy-Accept-Transform takes at most one token.
   if (headers->HasHeader(chrome_proxy_accept_transform_header()))
     return;
 
+  content::ResourceType resource_type = request_info->GetResourceType();
+
   if (resource_type == content::RESOURCE_TYPE_MEDIA) {
     headers->SetHeader(chrome_proxy_accept_transform_header(),
                        compressed_video_directive());
     return;
   }
 
-  // User is not using Lo-Fi or is part of the "Control" group.
-  if (!request_info->IsUsingLoFi() || !lofi_enabled_via_flag_or_field_trial)
+  // The Lo-Fi and Lite Page directives should not be added for users in the
+  // Lo-Fi field trial "Control" group.
+  bool lofi_enabled_via_flags_or_field_trial =
+      params::IsLoFiOnViaFlags() || params::IsIncludedInLoFiEnabledFieldTrial();
+
+  bool lite_page_enabled_via_flags_or_field_trial =
+      (params::IsLoFiOnViaFlags() && params::AreLitePagesEnabledViaFlags()) ||

[RyanSturm, 2016/10/19 18:58:56]

Is lofi being on via flags a requirement for lite pages being on via flags?

[bengr, 2016/10/19 23:34:28]

Yes, unfortunately.

[RyanSturm, 2016/10/19 23:43:12]

Acknowledged.

+      params::IsIncludedInLitePageFieldTrial();
+
+  // User does not have previews enabled.
+  if (!lofi_enabled_via_flags_or_field_trial &&
+      !lite_page_enabled_via_flags_or_field_trial) {
     return;
+  }
 
   // LoFi is not allowed on the main frame, stylesheet, script, font resource,
   // media, service worker, or CSP report.
   bool resource_type_supports_empty_image =
       !(resource_type == content::RESOURCE_TYPE_MAIN_FRAME ||
         resource_type == content::RESOURCE_TYPE_STYLESHEET ||
         resource_type == content::RESOURCE_TYPE_SCRIPT ||
         resource_type == content::RESOURCE_TYPE_FONT_RESOURCE ||
         resource_type == content::RESOURCE_TYPE_MEDIA ||
         resource_type == content::RESOURCE_TYPE_CSP_REPORT);
 
   // If in the preview field trial or the preview flag is enabled, only add the

[RyanSturm, 2016/10/19 18:58:56]

s/preview/lite page/

[RyanSturm, 2016/10/19 23:43:12]

Done.

   // "lite-page" directive on main frame requests. Do not add "empty-image"
   // directives to other requests when Lite Page previews are enabled.
+  // If a preview was not triggered due to the network being slow, add the

[RyanSturm, 2016/10/19 18:58:56]

This comment is somewhat confusing with the "not". Maybe just get rid of the
network details: "If a server-side preview was not triggered, add...

Move this part of the comment down to the code it applies to.

[RyanSturm, 2016/10/19 18:58:56]

nit: s/preview/server-side preview/  ?

[bengr, 2016/10/19 23:34:28]

Redundant imho. Headers only go to servers.

[bengr, 2016/10/19 23:34:28]

Done.

+  // "if-heavy" qualifier to allow the server to provide a preview when the
+  // page is data heavy.
   std::string accept_transform_value;
-  if (lite_page_via_flag_or_field_trial) {
+  if (lite_page_enabled_via_flags_or_field_trial) {
     if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME)
       accept_transform_value = lite_page_directive();
-  } else if (resource_type_supports_empty_image) {
-    accept_transform_value = empty_image_directive();
+  } else if (lofi_enabled_via_flags_or_field_trial) {
+    if (resource_type_supports_empty_image)
+      accept_transform_value = empty_image_directive();
   }
-
   if (accept_transform_value.empty())
     return;
 
+  if (!request_info->IsUsingLoFi())

[RyanSturm, 2016/10/19 18:58:56]

Just to verify, "if-heavy" is applied to lofi image requests here?

[bengr, 2016/10/19 23:34:28]

Yes. To both LoFi and Lite Page previews, and only if the slow network detector
did NOT trigger.

[RyanSturm, 2016/10/19 23:43:12]

Acknowledged.

+    accept_transform_value += base::StringPrintf(";%s", if_heavy_qualifier());
+
   headers->SetHeader(chrome_proxy_accept_transform_header(),
                      accept_transform_value);
 }
 
 bool ContentLoFiDecider::IsSlowPagePreviewRequested(
     const net::HttpRequestHeaders& headers) const {
   std::string accept_transform_header_value;
   if (!headers.GetHeader(chrome_proxy_accept_transform_header(),
                          &accept_transform_header_value)) {
     return false;
@@ skipping 56 matching lines @@
 
   // User is not using Lo-Fi.
   if (!request_info || !request_info->IsUsingLoFi())
     return false;
 
   return params::IsIncludedInLoFiEnabledFieldTrial() ||
          params::IsIncludedInLoFiControlFieldTrial();
 }
 
 }  // namespace data_reduction_proxy