| Index: content/browser/loader/resource_request_info_impl.cc
|
| diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
|
| index 20ce8d98cea9c631dfd396e810c0934062b839ea..d11d4cd6e22a8eb1685cb7fb5b8cad92996d1c6d 100644
|
| --- a/content/browser/loader/resource_request_info_impl.cc
|
| +++ b/content/browser/loader/resource_request_info_impl.cc
|
| @@ -7,6 +7,7 @@
|
| #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"
|
| @@ -41,33 +42,34 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
|
| // 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
|
| + false, // is_async_revalidation
|
| + NULL); // original_request
|
| info->AssociateWithRequest(request);
|
| }
|
|
|
| @@ -125,7 +127,9 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
|
| blink::WebPageVisibilityState visibility_state,
|
| ResourceContext* context,
|
| base::WeakPtr<ResourceMessageFilter> filter,
|
| - bool is_async)
|
| + bool is_async,
|
| + bool is_async_revalidation,
|
| + const ResourceHostMsg_Request* original_request)
|
| : cross_site_handler_(NULL),
|
| detachable_handler_(NULL),
|
| process_type_(process_type),
|
| @@ -155,7 +159,11 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
|
| visibility_state_(visibility_state),
|
| context_(context),
|
| filter_(filter),
|
| - is_async_(is_async) {
|
| + is_async_(is_async),
|
| + is_async_revalidation_(is_async_revalidation) {
|
| + if (original_request) {
|
| + original_request_.reset(new ResourceHostMsg_Request(*original_request));
|
| + }
|
| }
|
|
|
| ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
|
| @@ -243,6 +251,10 @@ bool ResourceRequestInfoImpl::IsAsync() const {
|
| return is_async_;
|
| }
|
|
|
| +bool ResourceRequestInfoImpl::IsAsyncRevalidation() const {
|
| + return is_async_revalidation_;
|
| +}
|
| +
|
| bool ResourceRequestInfoImpl::IsDownload() const {
|
| return is_download_;
|
| }
|
|
|