Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Side by Side Diff: content/browser/service_worker/service_worker_fetch_dispatcher.cc

Issue 2645363002: Copy the original request header for navigation preload requests (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/serviceworker/navigation-preload/request-headers.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 request.do_not_prompt_for_login = true; 459 request.do_not_prompt_for_login = true;
460 request.render_frame_id = original_info->GetRenderFrameID(); 460 request.render_frame_id = original_info->GetRenderFrameID();
461 request.is_main_frame = original_info->IsMainFrame(); 461 request.is_main_frame = original_info->IsMainFrame();
462 request.parent_is_main_frame = original_info->ParentIsMainFrame(); 462 request.parent_is_main_frame = original_info->ParentIsMainFrame();
463 463
464 DCHECK(net::HttpUtil::IsValidHeaderValue( 464 DCHECK(net::HttpUtil::IsValidHeaderValue(
465 version_->navigation_preload_state().header)); 465 version_->navigation_preload_state().header));
466 ServiceWorkerMetrics::RecordNavigationPreloadRequestHeaderSize( 466 ServiceWorkerMetrics::RecordNavigationPreloadRequestHeaderSize(
467 version_->navigation_preload_state().header.length()); 467 version_->navigation_preload_state().header.length());
468 request.headers = "Service-Worker-Navigation-Preload: " + 468 request.headers = "Service-Worker-Navigation-Preload: " +
469 version_->navigation_preload_state().header; 469 version_->navigation_preload_state().header + "\r\n" +
470 original_request->extra_request_headers().ToString();
470 471
471 const int request_id = ResourceDispatcherHostImpl::Get()->MakeRequestID(); 472 const int request_id = ResourceDispatcherHostImpl::Get()->MakeRequestID();
472 DCHECK_LT(request_id, -1); 473 DCHECK_LT(request_id, -1);
473 474
474 preload_handle_ = mojom::FetchEventPreloadHandle::New(); 475 preload_handle_ = mojom::FetchEventPreloadHandle::New();
475 mojom::URLLoaderClientPtr url_loader_client_ptr; 476 mojom::URLLoaderClientPtr url_loader_client_ptr;
476 preload_handle_->url_loader_client_request = 477 preload_handle_->url_loader_client_request =
477 mojo::MakeRequest(&url_loader_client_ptr); 478 mojo::MakeRequest(&url_loader_client_ptr);
478 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>( 479 auto url_loader_client = base::MakeUnique<DelegatingURLLoaderClient>(
479 std::move(url_loader_client_ptr)); 480 std::move(url_loader_client_ptr));
(...skipping 30 matching lines...) Expand all
510 ServiceWorkerVersion* version, 511 ServiceWorkerVersion* version,
511 int event_finish_id, 512 int event_finish_id,
512 scoped_refptr<URLLoaderAssets> url_loader_assets, 513 scoped_refptr<URLLoaderAssets> url_loader_assets,
513 ServiceWorkerStatusCode status, 514 ServiceWorkerStatusCode status,
514 base::Time dispatch_event_time) { 515 base::Time dispatch_event_time) {
515 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT, 516 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
516 dispatch_event_time); 517 dispatch_event_time);
517 } 518 }
518 519
519 } // namespace content 520 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/http/tests/serviceworker/navigation-preload/request-headers.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698