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

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: Address yhirano's comment #78 Created 3 years, 5 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 web_request->SetIsMainResourceLoad(request.is_main_resource_load); 217 web_request->SetIsMainResourceLoad(request.is_main_resource_load);
218 web_request->SetCredentialsMode( 218 web_request->SetCredentialsMode(
219 GetBlinkFetchCredentialsMode(request.credentials_mode)); 219 GetBlinkFetchCredentialsMode(request.credentials_mode));
220 web_request->SetRedirectMode( 220 web_request->SetRedirectMode(
221 GetBlinkFetchRedirectMode(request.redirect_mode)); 221 GetBlinkFetchRedirectMode(request.redirect_mode));
222 web_request->SetRequestContext( 222 web_request->SetRequestContext(
223 GetBlinkRequestContext(request.request_context_type)); 223 GetBlinkRequestContext(request.request_context_type));
224 web_request->SetFrameType(GetBlinkFrameType(request.frame_type)); 224 web_request->SetFrameType(GetBlinkFrameType(request.frame_type));
225 web_request->SetClientId(blink::WebString::FromUTF8(request.client_id)); 225 web_request->SetClientId(blink::WebString::FromUTF8(request.client_id));
226 web_request->SetIsReload(request.is_reload); 226 web_request->SetIsReload(request.is_reload);
227 web_request->SetIntegrity(blink::WebString::FromUTF8(request.integrity));
227 } 228 }
228 229
229 // Converts |response| to its equivalent type in the Blink API. 230 // Converts |response| to its equivalent type in the Blink API.
230 // TODO(peter): Remove this when the Mojo FetchAPIResponse type exists. 231 // TODO(peter): Remove this when the Mojo FetchAPIResponse type exists.
231 void ToWebServiceWorkerResponse(const ServiceWorkerResponse& response, 232 void ToWebServiceWorkerResponse(const ServiceWorkerResponse& response,
232 blink::WebServiceWorkerResponse* web_response) { 233 blink::WebServiceWorkerResponse* web_response) {
233 DCHECK(web_response); 234 DCHECK(web_response);
234 235
235 std::vector<blink::WebURL> url_list; 236 std::vector<blink::WebURL> url_list;
236 for (const GURL& url : response.url_list) 237 for (const GURL& url : response.url_list)
(...skipping 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 } 1717 }
1717 1718
1718 base::WeakPtr<ServiceWorkerContextClient> 1719 base::WeakPtr<ServiceWorkerContextClient>
1719 ServiceWorkerContextClient::GetWeakPtr() { 1720 ServiceWorkerContextClient::GetWeakPtr() {
1720 DCHECK(worker_task_runner_->RunsTasksInCurrentSequence()); 1721 DCHECK(worker_task_runner_->RunsTasksInCurrentSequence());
1721 DCHECK(context_); 1722 DCHECK(context_);
1722 return context_->weak_factory.GetWeakPtr(); 1723 return context_->weak_factory.GetWeakPtr();
1723 } 1724 }
1724 1725
1725 } // namespace content 1726 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698