content::ResourceDispatcherHostImpl changes for stale-while-revalidate

content/browser/loader/resource_request_info_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/resource_type.h"
 #include "net/base/load_states.h"
 
+struct ResourceHostMsg_Request;
+
 namespace content {
 class CrossSiteResourceHandler;
 class DetachableResourceHandler;
 class ResourceContext;
 class ResourceMessageFilter;
 struct GlobalRequestID;
 struct GlobalRoutingID;
 
 // Holds the data ResourceDispatcherHost associates with each request.
 // Retrieve this data by calling ResourceDispatcherHost::InfoForRequest.
 class ResourceRequestInfoImpl : public ResourceRequestInfo,
                                 public base::SupportsUserData::Data {
  public:
   // Returns the ResourceRequestInfoImpl associated with the given URLRequest.
   CONTENT_EXPORT static ResourceRequestInfoImpl* ForRequest(
       net::URLRequest* request);
 
   // And, a const version for cases where you only need read access.
   CONTENT_EXPORT static const ResourceRequestInfoImpl* ForRequest(
       const net::URLRequest* request);
 
+  // TODO(ricea): Something about this constructor.

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

?

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

I feel that 26 arguments is excessive. TODO removed.

+  // |original_request| is owned by the caller. If non-NULL, it is copied by
+  // the constructor.
   CONTENT_EXPORT ResourceRequestInfoImpl(
       int process_type,
       int child_id,
       int route_id,
       int frame_tree_node_id,
       int origin_pid,
       int request_id,
       int render_frame_id,
       bool is_main_frame,
       bool parent_is_main_frame,
       int parent_render_frame_id,
       ResourceType resource_type,
       ui::PageTransition transition_type,
       bool should_replace_current_entry,
       bool is_download,
       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);
   ~ResourceRequestInfoImpl() override;
 
   // ResourceRequestInfo implementation:
   ResourceContext* GetContext() const override;
   int GetChildID() const override;
   int GetRouteID() const override;
   int GetOriginPID() const override;
   int GetRequestID() const override;
   int GetRenderFrameID() const override;
   bool IsMainFrame() const override;
@@ skipping 93 matching lines @@
   void set_memory_cost(int cost) { memory_cost_ = cost; }
 
   bool is_load_timing_enabled() const { return enable_load_timing_; }
 
   bool is_upload_progress_enabled() const { return enable_upload_progress_; }
 
   bool do_not_prompt_for_login() const { return do_not_prompt_for_login_; }
   void set_do_not_prompt_for_login(bool do_not_prompt) {
     do_not_prompt_for_login_ = do_not_prompt;
   }
+  ResourceHostMsg_Request* original_request() {
+    return original_request_.get();
+  }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DeletedFilterDetached);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DeletedFilterDetachedRedirect);
   // Non-owning, may be NULL.
   CrossSiteResourceHandler* cross_site_handler_;
   DetachableResourceHandler* detachable_handler_;
 
@@ skipping 19 matching lines @@
   bool counted_as_in_flight_request_;
   ResourceType resource_type_;
   ui::PageTransition transition_type_;
   int memory_cost_;
   blink::WebReferrerPolicy referrer_policy_;
   blink::WebPageVisibilityState visibility_state_;
   ResourceContext* context_;
   // The filter might be deleted without deleting this object if the process
   // exits during a transfer.
   base::WeakPtr<ResourceMessageFilter> filter_;
+
+  // Original request information required to clone the request if an async

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

See comment in the RDH re how to avoid this.

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

I'm sorry, I can't find the comment that you are referring to.

+  // revalidation will be performed. NULL if async revalidation is not

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

nullptr

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

Done.

+  // applicable to this request (eg. it is already an async revalidation, is not
+  // method "GET", etc.).
+  scoped_ptr<ResourceHostMsg_Request> original_request_;
+
   bool is_async_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_