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

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

Issue 2654433012: Revert of Show service worker navigation preload requests in DevTools Network tab (Closed)
Patch Set: rebase again 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
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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 const bool report_security_info = false; 279 const bool report_security_info = false;
280 WebURLLoaderImpl::PopulateURLResponse(url_, response_head, response_.get(), 280 WebURLLoaderImpl::PopulateURLResponse(url_, response_head, response_.get(),
281 report_security_info); 281 report_security_info);
282 MaybeReportResponseToClient(); 282 MaybeReportResponseToClient();
283 } 283 }
284 284
285 void OnReceiveRedirect(const net::RedirectInfo& redirect_info, 285 void OnReceiveRedirect(const net::RedirectInfo& redirect_info,
286 const ResourceResponseHead& response_head) override { 286 const ResourceResponseHead& response_head) override {
287 // This will delete |this|. 287 // This will delete |this|.
288 ReportErrorToClient( 288 ReportErrorToClient(
289 "Service Worker navigation preload doesn't support redirects."); 289 "Service Worker navigation preload doesn't suport redirect.");
290 } 290 }
291 291
292 void OnDataDownloaded(int64_t data_length, 292 void OnDataDownloaded(int64_t data_length,
293 int64_t encoded_data_length) override { 293 int64_t encoded_data_length) override {
294 NOTREACHED(); 294 NOTREACHED();
295 } 295 }
296 296
297 void OnUploadProgress(int64_t current_position, 297 void OnUploadProgress(int64_t current_position,
298 int64_t total_size, 298 int64_t total_size,
299 const base::Closure& ack_callback) override { 299 const base::Closure& ack_callback) override {
300 NOTREACHED(); 300 NOTREACHED();
301 } 301 }
302 302
303 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {} 303 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {}
304 304
305 void OnTransferSizeUpdated(int32_t transfer_size_diff) override { 305 void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
306 // TODO(horo): Send this transfer size update notification to DevTools. 306 NOTREACHED();
307 } 307 }
308 308
309 void OnStartLoadingResponseBody( 309 void OnStartLoadingResponseBody(
310 mojo::ScopedDataPipeConsumerHandle body) override { 310 mojo::ScopedDataPipeConsumerHandle body) override {
311 DCHECK(!body_.is_valid()); 311 DCHECK(!body_.is_valid());
312 body_ = std::move(body); 312 body_ = std::move(body);
313 MaybeReportResponseToClient(); 313 MaybeReportResponseToClient();
314 } 314 }
315 315
316 void OnComplete(const ResourceRequestCompletionStatus& status) override { 316 void OnComplete(const ResourceRequestCompletionStatus& status) override {
317 if (status.error_code != net::OK) { 317 if (status.error_code != net::OK) {
318 // This will delete |this|. 318 // This will delete |this|.
319 ReportErrorToClient("Service Worker navigation preload network error."); 319 ReportErrorToClient("Service Worker navigation preload network error.");
320 return; 320 return;
321 } 321 }
322 322
323 ServiceWorkerContextClient* client = 323 ServiceWorkerContextClient* client =
324 ServiceWorkerContextClient::ThreadSpecificInstance(); 324 ServiceWorkerContextClient::ThreadSpecificInstance();
325 if (!client) 325 if (!client)
326 return; 326 return;
327 // This will delete |this|. 327 // This will delete |this|.
328 client->OnNavigationPreloadComplete(fetch_event_id_, 328 client->OnNavigationPreloadComplete(fetch_event_id_);
329 status.encoded_data_length);
330 } 329 }
331 330
332 private: 331 private:
333 void MaybeReportResponseToClient() { 332 void MaybeReportResponseToClient() {
334 if (!response_ || !body_.is_valid()) 333 if (!response_ || !body_.is_valid())
335 return; 334 return;
336 ServiceWorkerContextClient* client = 335 ServiceWorkerContextClient* client =
337 ServiceWorkerContextClient::ThreadSpecificInstance(); 336 ServiceWorkerContextClient::ThreadSpecificInstance();
338 if (!client) 337 if (!client)
339 return; 338 return;
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 TRACE_EVENT0("ServiceWorker", 951 TRACE_EVENT0("ServiceWorker",
953 "ServiceWorkerContextClient::OnInstallEvent"); 952 "ServiceWorkerContextClient::OnInstallEvent");
954 proxy_->dispatchInstallEvent(request_id); 953 proxy_->dispatchInstallEvent(request_id);
955 } 954 }
956 955
957 void ServiceWorkerContextClient::DispatchFetchEvent( 956 void ServiceWorkerContextClient::DispatchFetchEvent(
958 int fetch_event_id, 957 int fetch_event_id,
959 const ServiceWorkerFetchRequest& request, 958 const ServiceWorkerFetchRequest& request,
960 mojom::FetchEventPreloadHandlePtr preload_handle, 959 mojom::FetchEventPreloadHandlePtr preload_handle,
961 const DispatchFetchEventCallback& callback) { 960 const DispatchFetchEventCallback& callback) {
962 std::unique_ptr<NavigationPreloadRequest> preload_request; 961 std::unique_ptr<NavigationPreloadRequest> preload_request =
963 if (preload_handle) { 962 preload_handle
964 proxy_->onNavigationPreloadSent(fetch_event_id, request.url); 963 ? base::MakeUnique<NavigationPreloadRequest>(
965 preload_request = base::MakeUnique<NavigationPreloadRequest>( 964 fetch_event_id, request.url, std::move(preload_handle))
966 fetch_event_id, request.url, std::move(preload_handle)); 965 : nullptr;
967 }
968 const bool navigation_preload_sent = !!preload_request; 966 const bool navigation_preload_sent = !!preload_request;
969 blink::WebServiceWorkerRequest webRequest; 967 blink::WebServiceWorkerRequest webRequest;
970 TRACE_EVENT0("ServiceWorker", 968 TRACE_EVENT0("ServiceWorker",
971 "ServiceWorkerContextClient::DispatchFetchEvent"); 969 "ServiceWorkerContextClient::DispatchFetchEvent");
972 context_->fetch_event_callbacks.AddWithID( 970 context_->fetch_event_callbacks.AddWithID(
973 base::MakeUnique<FetchCallback>(callback), fetch_event_id); 971 base::MakeUnique<FetchCallback>(callback), fetch_event_id);
974 if (preload_request) { 972 if (preload_request) {
975 context_->preload_requests.AddWithID(std::move(preload_request), 973 context_->preload_requests.AddWithID(std::move(preload_request),
976 fetch_event_id); 974 fetch_event_id);
977 } 975 }
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 } 1244 }
1247 1245
1248 void ServiceWorkerContextClient::OnNavigationPreloadError( 1246 void ServiceWorkerContextClient::OnNavigationPreloadError(
1249 int fetch_event_id, 1247 int fetch_event_id,
1250 std::unique_ptr<blink::WebServiceWorkerError> error) { 1248 std::unique_ptr<blink::WebServiceWorkerError> error) {
1251 proxy_->onNavigationPreloadError(fetch_event_id, std::move(error)); 1249 proxy_->onNavigationPreloadError(fetch_event_id, std::move(error));
1252 context_->preload_requests.Remove(fetch_event_id); 1250 context_->preload_requests.Remove(fetch_event_id);
1253 } 1251 }
1254 1252
1255 void ServiceWorkerContextClient::OnNavigationPreloadComplete( 1253 void ServiceWorkerContextClient::OnNavigationPreloadComplete(
1256 int fetch_event_id, 1254 int fetch_event_id) {
1257 int64_t encoded_data_length) {
1258 proxy_->onNavigationPreloadCompleted(fetch_event_id, encoded_data_length);
1259 context_->preload_requests.Remove(fetch_event_id); 1255 context_->preload_requests.Remove(fetch_event_id);
1260 } 1256 }
1261 1257
1262 base::WeakPtr<ServiceWorkerContextClient> 1258 base::WeakPtr<ServiceWorkerContextClient>
1263 ServiceWorkerContextClient::GetWeakPtr() { 1259 ServiceWorkerContextClient::GetWeakPtr() {
1264 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 1260 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
1265 DCHECK(context_); 1261 DCHECK(context_);
1266 return context_->weak_factory.GetWeakPtr(); 1262 return context_->weak_factory.GetWeakPtr();
1267 } 1263 }
1268 1264
1269 } // namespace content 1265 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698