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

Side by Side Diff: content/renderer/service_worker/service_worker_context_client.cc

Issue 2941883003: [ServiceWorker] Fetch event should return integrity value (Closed)
Patch Set: Rebase Created 3 years, 6 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/renderer/service_worker/service_worker_context_client.h" 5 #include "content/renderer/service_worker/service_worker_context_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 web_request->SetIsMainResourceLoad(request.is_main_resource_load); 203 web_request->SetIsMainResourceLoad(request.is_main_resource_load);
204 web_request->SetCredentialsMode( 204 web_request->SetCredentialsMode(
205 GetBlinkFetchCredentialsMode(request.credentials_mode)); 205 GetBlinkFetchCredentialsMode(request.credentials_mode));
206 web_request->SetRedirectMode( 206 web_request->SetRedirectMode(
207 GetBlinkFetchRedirectMode(request.redirect_mode)); 207 GetBlinkFetchRedirectMode(request.redirect_mode));
208 web_request->SetRequestContext( 208 web_request->SetRequestContext(
209 GetBlinkRequestContext(request.request_context_type)); 209 GetBlinkRequestContext(request.request_context_type));
210 web_request->SetFrameType(GetBlinkFrameType(request.frame_type)); 210 web_request->SetFrameType(GetBlinkFrameType(request.frame_type));
211 web_request->SetClientId(blink::WebString::FromUTF8(request.client_id)); 211 web_request->SetClientId(blink::WebString::FromUTF8(request.client_id));
212 web_request->SetIsReload(request.is_reload); 212 web_request->SetIsReload(request.is_reload);
213 web_request->SetIntegrity(blink::WebString::FromUTF8(request.integrity));
213 } 214 }
214 215
215 // Converts |response| to its equivalent type in the Blink API. 216 // Converts |response| to its equivalent type in the Blink API.
216 // TODO(peter): Remove this when the Mojo FetchAPIResponse type exists. 217 // TODO(peter): Remove this when the Mojo FetchAPIResponse type exists.
217 void ToWebServiceWorkerResponse(const ServiceWorkerResponse& response, 218 void ToWebServiceWorkerResponse(const ServiceWorkerResponse& response,
218 blink::WebServiceWorkerResponse* web_response) { 219 blink::WebServiceWorkerResponse* web_response) {
219 DCHECK(web_response); 220 DCHECK(web_response);
220 221
221 std::vector<blink::WebURL> url_list; 222 std::vector<blink::WebURL> url_list;
222 for (const GURL& url : response.url_list) 223 for (const GURL& url : response.url_list)
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1696 } 1697 }
1697 1698
1698 base::WeakPtr<ServiceWorkerContextClient> 1699 base::WeakPtr<ServiceWorkerContextClient>
1699 ServiceWorkerContextClient::GetWeakPtr() { 1700 ServiceWorkerContextClient::GetWeakPtr() {
1700 DCHECK(worker_task_runner_->RunsTasksInCurrentSequence()); 1701 DCHECK(worker_task_runner_->RunsTasksInCurrentSequence());
1701 DCHECK(context_); 1702 DCHECK(context_);
1702 return context_->weak_factory.GetWeakPtr(); 1703 return context_->weak_factory.GetWeakPtr();
1703 } 1704 }
1704 1705
1705 } // namespace content 1706 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698