| Index: third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp
|
| index ee5af3a5ec3a8afe94a6a7ab6ba48d6d532a1320..0e5082ab0b3888572108ef85e1f26edd50e2bc35 100644
|
| --- a/third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp
|
| +++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp
|
| @@ -47,7 +47,6 @@ ResourceRequest::ResourceRequest(const String& url_string)
|
|
|
| ResourceRequest::ResourceRequest(const KURL& url)
|
| : url_(url),
|
| - cache_policy_(WebCachePolicy::kUseProtocolCachePolicy),
|
| timeout_interval_(default_timeout_interval_),
|
| requestor_origin_(nullptr),
|
| http_method_(HTTPNames::GET),
|
| @@ -59,18 +58,19 @@ ResourceRequest::ResourceRequest(const KURL& url)
|
| use_stream_on_response_(false),
|
| keepalive_(false),
|
| should_reset_app_cache_(false),
|
| + cache_policy_(WebCachePolicy::kUseProtocolCachePolicy),
|
| service_worker_mode_(WebURLRequest::ServiceWorkerMode::kAll),
|
| priority_(kResourceLoadPriorityLowest),
|
| intra_priority_value_(0),
|
| requestor_id_(0),
|
| requestor_process_id_(0),
|
| app_cache_host_id_(0),
|
| + previews_state_(WebURLRequest::kPreviewsUnspecified),
|
| request_context_(WebURLRequest::kRequestContextUnspecified),
|
| frame_type_(WebURLRequest::kFrameTypeNone),
|
| fetch_request_mode_(WebURLRequest::kFetchRequestModeNoCORS),
|
| fetch_credentials_mode_(WebURLRequest::kFetchCredentialsModeInclude),
|
| fetch_redirect_mode_(WebURLRequest::kFetchRedirectModeFollow),
|
| - previews_state_(WebURLRequest::kPreviewsUnspecified),
|
| referrer_policy_(kReferrerPolicyDefault),
|
| did_set_http_referrer_(false),
|
| check_for_browser_side_navigation_(true),
|
| @@ -86,7 +86,6 @@ ResourceRequest::ResourceRequest(const KURL& url)
|
|
|
| ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
|
| : ResourceRequest(data->url_) {
|
| - SetCachePolicy(data->cache_policy_);
|
| SetTimeoutInterval(data->timeout_interval_);
|
| SetFirstPartyForCookies(data->first_party_for_cookies_);
|
| SetRequestorOrigin(data->requestor_origin_);
|
| @@ -103,17 +102,18 @@ ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
|
| SetDownloadToFile(data->download_to_file_);
|
| SetUseStreamOnResponse(data->use_stream_on_response_);
|
| SetKeepalive(data->keepalive_);
|
| + SetCachePolicy(data->cache_policy_);
|
| SetServiceWorkerMode(data->service_worker_mode_);
|
| SetShouldResetAppCache(data->should_reset_app_cache_);
|
| SetRequestorID(data->requestor_id_);
|
| SetRequestorProcessID(data->requestor_process_id_);
|
| SetAppCacheHostID(data->app_cache_host_id_);
|
| + SetPreviewsState(data->previews_state_);
|
| SetRequestContext(data->request_context_);
|
| SetFrameType(data->frame_type_);
|
| SetFetchRequestMode(data->fetch_request_mode_);
|
| SetFetchCredentialsMode(data->fetch_credentials_mode_);
|
| SetFetchRedirectMode(data->fetch_redirect_mode_);
|
| - SetPreviewsState(data->previews_state_);
|
| referrer_policy_ = data->referrer_policy_;
|
| did_set_http_referrer_ = data->did_set_http_referrer_;
|
| check_for_browser_side_navigation_ = data->check_for_browser_side_navigation_;
|
| @@ -133,7 +133,6 @@ std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::CopyData()
|
| std::unique_ptr<CrossThreadResourceRequestData> data =
|
| WTF::MakeUnique<CrossThreadResourceRequestData>();
|
| data->url_ = Url().Copy();
|
| - data->cache_policy_ = GetCachePolicy();
|
| data->timeout_interval_ = TimeoutInterval();
|
| data->first_party_for_cookies_ = FirstPartyForCookies().Copy();
|
| data->requestor_origin_ =
|
| @@ -153,17 +152,18 @@ std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::CopyData()
|
| data->download_to_file_ = download_to_file_;
|
| data->use_stream_on_response_ = use_stream_on_response_;
|
| data->keepalive_ = keepalive_;
|
| + data->cache_policy_ = GetCachePolicy();
|
| data->service_worker_mode_ = service_worker_mode_;
|
| data->should_reset_app_cache_ = should_reset_app_cache_;
|
| data->requestor_id_ = requestor_id_;
|
| data->requestor_process_id_ = requestor_process_id_;
|
| data->app_cache_host_id_ = app_cache_host_id_;
|
| + data->previews_state_ = previews_state_;
|
| data->request_context_ = request_context_;
|
| data->frame_type_ = frame_type_;
|
| data->fetch_request_mode_ = fetch_request_mode_;
|
| data->fetch_credentials_mode_ = fetch_credentials_mode_;
|
| data->fetch_redirect_mode_ = fetch_redirect_mode_;
|
| - data->previews_state_ = previews_state_;
|
| data->referrer_policy_ = referrer_policy_;
|
| data->did_set_http_referrer_ = did_set_http_referrer_;
|
| data->check_for_browser_side_navigation_ = check_for_browser_side_navigation_;
|
|
|