content::ResourceDispatcherHostImpl changes for stale-while-revalidate

content/browser/loader/resource_request_info_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.
 
 #include "content/browser/loader/resource_request_info_impl.h"
 
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/common/net/url_request_user_data.h"
+#include "content/common/resource_messages.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/process_type.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 // ----------------------------------------------------------------------------
 // ResourceRequestInfo
 
 // static
@@ skipping 14 matching lines @@
                                              bool allow_download,
                                              bool is_async) {
   // Make sure both |is_main_frame| and |parent_is_main_frame| aren't set at the
   // same time.
   DCHECK(!(is_main_frame && parent_is_main_frame));
 
   // Make sure RESOURCE_TYPE_MAIN_FRAME is declared as being fetched as part of
   // the main frame.
   DCHECK(resource_type != RESOURCE_TYPE_MAIN_FRAME || is_main_frame);
 
-  ResourceRequestInfoImpl* info =
-      new ResourceRequestInfoImpl(
-          PROCESS_TYPE_RENDERER,             // process_type
-          render_process_id,                 // child_id
-          render_view_id,                    // route_id
-          -1,                                // frame_tree_node_id
-          0,                                 // origin_pid
-          0,                                 // request_id
-          render_frame_id,                   // render_frame_id
-          is_main_frame,                     // is_main_frame
-          parent_is_main_frame,              // parent_is_main_frame
-          0,                                 // parent_render_frame_id
-          resource_type,                     // resource_type
-          ui::PAGE_TRANSITION_LINK,          // transition_type
-          false,                             // should_replace_current_entry
-          false,                             // is_download
-          false,                             // is_stream
-          allow_download,                    // allow_download
-          false,                             // has_user_gesture
-          false,                             // enable load timing
-          request->has_upload(),             // enable upload progress
-          false,                             // do_not_prompt_for_login
-          blink::WebReferrerPolicyDefault,   // referrer_policy
-          blink::WebPageVisibilityStateVisible,  // visibility_state
-          context,                           // context
-          base::WeakPtr<ResourceMessageFilter>(),  // filter
-          is_async);                         // is_async
+  ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl(
+      PROCESS_TYPE_RENDERER,                   // process_type
+      render_process_id,                       // child_id
+      render_view_id,                          // route_id
+      -1,                                      // frame_tree_node_id
+      0,                                       // origin_pid
+      0,                                       // request_id
+      render_frame_id,                         // render_frame_id
+      is_main_frame,                           // is_main_frame
+      parent_is_main_frame,                    // parent_is_main_frame
+      0,                                       // parent_render_frame_id
+      resource_type,                           // resource_type
+      ui::PAGE_TRANSITION_LINK,                // transition_type
+      false,                                   // should_replace_current_entry
+      false,                                   // is_download
+      false,                                   // is_stream
+      allow_download,                          // allow_download
+      false,                                   // has_user_gesture
+      false,                                   // enable load timing
+      request->has_upload(),                   // enable upload progress
+      false,                                   // do_not_prompt_for_login
+      blink::WebReferrerPolicyDefault,         // referrer_policy
+      blink::WebPageVisibilityStateVisible,    // visibility_state
+      context,                                 // context
+      base::WeakPtr<ResourceMessageFilter>(),  // filter
+      is_async,                                // is_async
+      NULL);                                   // original_request

[davidben, 2015/10/08 21:57:52]

nullptr

[Adam Rice, 2015/10/13 22:53:17]

Done.

   info->AssociateWithRequest(request);
 }
 
 // static
 bool ResourceRequestInfo::GetRenderFrameForRequest(
     const net::URLRequest* request,
     int* render_process_id,
     int* render_frame_id) {
   URLRequestUserData* user_data = static_cast<URLRequestUserData*>(
       request->GetUserData(URLRequestUserData::kUserDataKey));
@@ skipping 37 matching lines @@
     bool is_stream,
     bool allow_download,
     bool has_user_gesture,
     bool enable_load_timing,
     bool enable_upload_progress,
     bool do_not_prompt_for_login,
     blink::WebReferrerPolicy referrer_policy,
     blink::WebPageVisibilityState visibility_state,
     ResourceContext* context,
     base::WeakPtr<ResourceMessageFilter> filter,
-    bool is_async)
+    bool is_async,
+    const ResourceHostMsg_Request* original_request)
     : cross_site_handler_(NULL),
       detachable_handler_(NULL),
       process_type_(process_type),
       child_id_(child_id),
       route_id_(route_id),
       frame_tree_node_id_(frame_tree_node_id),
       origin_pid_(origin_pid),
       request_id_(request_id),
       render_frame_id_(render_frame_id),
       is_main_frame_(is_main_frame),
@@ skipping 10 matching lines @@
       was_ignored_by_handler_(false),
       counted_as_in_flight_request_(false),
       resource_type_(resource_type),
       transition_type_(transition_type),
       memory_cost_(0),
       referrer_policy_(referrer_policy),
       visibility_state_(visibility_state),
       context_(context),
       filter_(filter),
       is_async_(is_async) {
+  if (original_request) {
+    // ResourceHostMsg_Request can be safely copied because it is a struct with
+    // only copyable types as members. The only potentially dangerous member is
+    // request_body, and ResourceDispatcherHostImpl ensures that is never set
+    // for an asynchronous revalidation.

[davidben, 2015/10/08 21:57:52]

This class cannot depend on ResourceDispatcherHostImpl's behavior. This is a
caller obligation and should be documented as such in the public API.

[Adam Rice, 2015/10/13 22:53:17]

Done.

+    DCHECK(!original_request->request_body);
+    original_request_.reset(new ResourceHostMsg_Request(*original_request));
+  }
 }
 
 ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
 }
 
 ResourceContext* ResourceRequestInfoImpl::GetContext() const {
   return context_;
 }
 
 int ResourceRequestInfoImpl::GetChildID() const {
@@ skipping 106 matching lines @@
     base::WeakPtr<ResourceMessageFilter> filter) {
   child_id_ = child_id;
   route_id_ = route_id;
   origin_pid_ = origin_pid;
   request_id_ = request_id;
   parent_render_frame_id_ = parent_render_frame_id;
   filter_ = filter;
 }
 
 }  // namespace content