Change Lo-Fi bool to bitmask to support multiple Previews types

content/browser/loader/resource_dispatcher_host_impl.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <stddef.h>
 
@@ skipping 339 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   RenderFrameHostImpl* host =
       RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
   if (host != nullptr) {
     DCHECK(host->frame_tree_node()->IsMainFrame());
     host->frame_tree_node()->navigator()->LogResourceRequestTime(
         timestamp, url);
   }
 }
 
-bool IsUsingLoFi(LoFiState lofi_state,
-                 ResourceDispatcherHostDelegate* delegate,
-                 const net::URLRequest& request,
-                 ResourceContext* resource_context,
-                 bool is_main_frame) {
-  if (lofi_state == LOFI_UNSPECIFIED && delegate && is_main_frame)
-    return delegate->ShouldEnableLoFiMode(request, resource_context);
-  return lofi_state == LOFI_ON;
+int GetPreviewsState(int previews_state,

[nasko, 2016/12/08 22:19:32]

PreviewsState

[megjablon, 2016/12/09 20:35:54]

Done.

+                     ResourceDispatcherHostDelegate* delegate,
+                     const net::URLRequest& request,
+                     ResourceContext* resource_context,
+                     bool is_main_frame) {
+  // previews_state is set to PREVIEWS_OFF when reloading with Lo-Fi disabled.
+  // A previews_state of zero means that the state has not been set, and the
+  // browser process should decide whether or not to request Preview types.
+  if (previews_state == 0 && delegate && is_main_frame)
+    return delegate->GetPreviewsState(request, resource_context);
+  return previews_state;
 }
 
 // The following functions simplify code paths where the UI thread notifies the
 // ResourceDispatcherHostImpl of information pertaining to loading behavior of
 // frame hosts.
 void NotifyForRouteOnIO(
     base::Callback<void(ResourceDispatcherHostImpl*,
                         const GlobalFrameRoutingId&)> frame_callback,
     const GlobalFrameRoutingId& global_routing_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 1163 matching lines @@
       request_data.is_main_frame, request_data.parent_is_main_frame,
       request_data.resource_type, request_data.transition_type,
       request_data.should_replace_current_entry,
       false,  // is download
       false,  // is stream
       allow_download, request_data.has_user_gesture,
       request_data.enable_load_timing, request_data.enable_upload_progress,
       do_not_prompt_for_login, request_data.referrer_policy,
       request_data.visibility_state, resource_context, report_raw_headers,
       !is_sync_load,
-      IsUsingLoFi(request_data.lofi_state, delegate_, *new_request,
-                  resource_context,
-                  request_data.resource_type == RESOURCE_TYPE_MAIN_FRAME),
+      GetPreviewsState(request_data.previews_state, delegate_, *new_request,
+                       resource_context,
+                       request_data.resource_type == RESOURCE_TYPE_MAIN_FRAME),
       support_async_revalidation ? request_data.headers : std::string(),
       request_data.request_body, request_data.initiated_in_secure_context);
   // Request takes ownership.
   extra_info->AssociateWithRequest(new_request.get());
 
   if (new_request->url().SchemeIs(url::kBlobScheme)) {
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
     storage::BlobProtocolHandler::SetRequestedBlobDataHandle(
         new_request.get(), requester_info->blob_storage_context()
@@ skipping 268 matching lines @@
     ResourceRequesterInfo* requester_info,
     int request_id) {
   CancelRequestFromRenderer(
       GlobalRequestID(requester_info->child_id(), request_id));
 }
 
 ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
     int child_id,
     int render_view_route_id,
     int render_frame_route_id,
+    int previews_state,

[nasko, 2016/12/08 22:19:33]

PreviewsState

[megjablon, 2016/12/09 20:35:54]

Done.

     bool download,
     ResourceContext* context) {
   return new ResourceRequestInfoImpl(
       ResourceRequesterInfo::CreateForDownloadOrPageSave(child_id),
       render_view_route_id,
       -1,  // frame_tree_node_id
       0, MakeRequestID(), render_frame_route_id,
       false,  // is_main_frame
       false,  // parent_is_main_frame
       RESOURCE_TYPE_SUB_RESOURCE, ui::PAGE_TRANSITION_LINK,
       false,     // should_replace_current_entry
       download,  // is_download
       false,     // is_stream
       download,  // allow_download
       false,     // has_user_gesture
       false,     // enable_load_timing
       false,     // enable_upload_progress
       false,     // do_not_prompt_for_login
       blink::WebReferrerPolicyDefault, blink::WebPageVisibilityStateVisible,
       context,
-      false,          // report_raw_headers
-      true,           // is_async
-      false,          // is_using_lofi
-      std::string(),  // original_headers
-      nullptr,        // body
-      false);         // initiated_in_secure_context
+      false,           // report_raw_headers
+      true,            // is_async
+      previews_state,  // previews_state
+      std::string(),   // original_headers
+      nullptr,         // body
+      false);          // initiated_in_secure_context
 }
 
 void ResourceDispatcherHostImpl::OnRenderViewHostCreated(int child_id,
                                                          int route_id) {
   scheduler_->OnClientCreated(child_id, route_id);
 }
 
 void ResourceDispatcherHostImpl::OnRenderViewHostDeleted(int child_id,
                                                          int route_id) {
   scheduler_->OnClientDeleted(child_id, route_id);
@@ skipping 346 matching lines @@
       info.common_params.gesture == NavigationGestureUser,
       true,   // enable_load_timing
       false,  // enable_upload_progress
       false,  // do_not_prompt_for_login
       info.common_params.referrer.policy,
       // TODO(davidben): This is only used for prerenders. Replace
       // is_showing with something for that. Or maybe it just comes from the
       // same mechanism as the cookie one.
       blink::WebPageVisibilityStateVisible, resource_context,
       info.report_raw_headers,
-      true,  // is_async
-      IsUsingLoFi(info.common_params.lofi_state, delegate_, *new_request,
-                  resource_context, info.is_main_frame),
+      true,   // is_async
+      GetPreviewsState(info.common_params.previews_state, delegate_,
+                       *new_request, resource_context, info.is_main_frame),
       // The original_headers field is for stale-while-revalidate but the
       // feature doesn't work with PlzNavigate, so it's just a placeholder
       // here.
       // TODO(ricea): Make the feature work with stale-while-revalidate
       // and clean this up.
       std::string(),  // original_headers
       info.common_params.post_data,
       // TODO(mek): Currently initiated_in_secure_context is only used for
       // subresource requests, so it doesn't matter what value it gets here.
       // If in the future this changes this should be updated to somehow get a
@@ skipping 148 matching lines @@
   StartLoading(info, std::move(loader));
 }
 
 void ResourceDispatcherHostImpl::InitializeURLRequest(
     net::URLRequest* request,
     const Referrer& referrer,
     bool is_download,
     int render_process_host_id,
     int render_view_routing_id,
     int render_frame_routing_id,
+    int previews_state,

[nasko, 2016/12/08 22:19:32]

PreviewsState

[megjablon, 2016/12/09 20:35:54]

Done.

     ResourceContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!request->is_pending());
 
   SetReferrerForRequest(request, referrer);
 
-  ResourceRequestInfoImpl* info =
-      CreateRequestInfo(render_process_host_id, render_view_routing_id,
-                        render_frame_routing_id, is_download, context);
+  ResourceRequestInfoImpl* info = CreateRequestInfo(
+      render_process_host_id, render_view_routing_id, render_frame_routing_id,
+      previews_state, is_download, context);
   // Request takes ownership.
   info->AssociateWithRequest(request);
 }
 
 void ResourceDispatcherHostImpl::BeginURLRequest(
     std::unique_ptr<net::URLRequest> request,
     std::unique_ptr<ResourceHandler> handler,
     bool is_download,
     bool is_content_initiated,
     bool do_not_prompt_for_login,
@@ skipping 390 matching lines @@
                                  &throttles);
     if (!throttles.empty()) {
       handler.reset(new ThrottlingResourceHandler(std::move(handler), request,
                                                   std::move(throttles)));
     }
   }
   return handler;
 }
 
 }  // namespace content