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

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

Issue 2649923007: Revert of Show service worker navigation preload requests in DevTools Network tab (Closed)
Patch Set: Created 3 years, 10 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 OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {} 297 void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {}
298 298
299 void OnTransferSizeUpdated(int32_t transfer_size_diff) override { 299 void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
300 // TODO(horo): Send this transfer size update notification to DevTools. 300 NOTREACHED();
301 } 301 }
302 302
303 void OnStartLoadingResponseBody( 303 void OnStartLoadingResponseBody(
304 mojo::ScopedDataPipeConsumerHandle body) override { 304 mojo::ScopedDataPipeConsumerHandle body) override {
305 DCHECK(!body_.is_valid()); 305 DCHECK(!body_.is_valid());
306 body_ = std::move(body); 306 body_ = std::move(body);
307 MaybeReportResponseToClient(); 307 MaybeReportResponseToClient();
308 } 308 }
309 309
310 void OnComplete(const ResourceRequestCompletionStatus& status) override { 310 void OnComplete(const ResourceRequestCompletionStatus& status) override {
311 if (status.error_code != net::OK) { 311 if (status.error_code != net::OK) {
312 // This will delete |this|. 312 // This will delete |this|.
313 ReportErrorToClient("Service Worker navigation preload network error."); 313 ReportErrorToClient("Service Worker navigation preload network error.");
314 return; 314 return;
315 } 315 }
316 316
317 ServiceWorkerContextClient* client = 317 ServiceWorkerContextClient* client =
318 ServiceWorkerContextClient::ThreadSpecificInstance(); 318 ServiceWorkerContextClient::ThreadSpecificInstance();
319 if (!client) 319 if (!client)
320 return; 320 return;
321 // This will delete |this|. 321 // This will delete |this|.
322 client->OnNavigationPreloadComplete(fetch_event_id_, 322 client->OnNavigationPreloadComplete(fetch_event_id_);
323 status.encoded_data_length);
324 } 323 }
325 324
326 private: 325 private:
327 void MaybeReportResponseToClient() { 326 void MaybeReportResponseToClient() {
328 if (!response_ || !body_.is_valid()) 327 if (!response_ || !body_.is_valid())
329 return; 328 return;
330 ServiceWorkerContextClient* client = 329 ServiceWorkerContextClient* client =
331 ServiceWorkerContextClient::ThreadSpecificInstance(); 330 ServiceWorkerContextClient::ThreadSpecificInstance();
332 if (!client) 331 if (!client)
333 return; 332 return;
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 TRACE_EVENT0("ServiceWorker", 945 TRACE_EVENT0("ServiceWorker",
947 "ServiceWorkerContextClient::OnInstallEvent"); 946 "ServiceWorkerContextClient::OnInstallEvent");
948 proxy_->dispatchInstallEvent(request_id); 947 proxy_->dispatchInstallEvent(request_id);
949 } 948 }
950 949
951 void ServiceWorkerContextClient::DispatchFetchEvent( 950 void ServiceWorkerContextClient::DispatchFetchEvent(
952 int fetch_event_id, 951 int fetch_event_id,
953 const ServiceWorkerFetchRequest& request, 952 const ServiceWorkerFetchRequest& request,
954 mojom::FetchEventPreloadHandlePtr preload_handle, 953 mojom::FetchEventPreloadHandlePtr preload_handle,
955 const DispatchFetchEventCallback& callback) { 954 const DispatchFetchEventCallback& callback) {
956 std::unique_ptr<NavigationPreloadRequest> preload_request; 955 std::unique_ptr<NavigationPreloadRequest> preload_request =
957 if (preload_handle) { 956 preload_handle
958 proxy_->onNavigationPreloadSent(fetch_event_id, request.url); 957 ? base::MakeUnique<NavigationPreloadRequest>(
959 preload_request = base::MakeUnique<NavigationPreloadRequest>( 958 fetch_event_id, request.url, std::move(preload_handle))
960 fetch_event_id, request.url, std::move(preload_handle)); 959 : nullptr;
961 }
962 const bool navigation_preload_sent = !!preload_request; 960 const bool navigation_preload_sent = !!preload_request;
963 blink::WebServiceWorkerRequest webRequest; 961 blink::WebServiceWorkerRequest webRequest;
964 TRACE_EVENT0("ServiceWorker", 962 TRACE_EVENT0("ServiceWorker",
965 "ServiceWorkerContextClient::DispatchFetchEvent"); 963 "ServiceWorkerContextClient::DispatchFetchEvent");
966 context_->fetch_event_callbacks.AddWithID( 964 context_->fetch_event_callbacks.AddWithID(
967 base::MakeUnique<FetchCallback>(callback), fetch_event_id); 965 base::MakeUnique<FetchCallback>(callback), fetch_event_id);
968 if (preload_request) { 966 if (preload_request) {
969 context_->preload_requests.AddWithID(std::move(preload_request), 967 context_->preload_requests.AddWithID(std::move(preload_request),
970 fetch_event_id); 968 fetch_event_id);
971 } 969 }
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 } 1238 }
1241 1239
1242 void ServiceWorkerContextClient::OnNavigationPreloadError( 1240 void ServiceWorkerContextClient::OnNavigationPreloadError(
1243 int fetch_event_id, 1241 int fetch_event_id,
1244 std::unique_ptr<blink::WebServiceWorkerError> error) { 1242 std::unique_ptr<blink::WebServiceWorkerError> error) {
1245 proxy_->onNavigationPreloadError(fetch_event_id, std::move(error)); 1243 proxy_->onNavigationPreloadError(fetch_event_id, std::move(error));
1246 context_->preload_requests.Remove(fetch_event_id); 1244 context_->preload_requests.Remove(fetch_event_id);
1247 } 1245 }
1248 1246
1249 void ServiceWorkerContextClient::OnNavigationPreloadComplete( 1247 void ServiceWorkerContextClient::OnNavigationPreloadComplete(
1250 int fetch_event_id, 1248 int fetch_event_id) {
1251 int64_t encoded_data_length) {
1252 proxy_->onNavigationPreloadCompleted(fetch_event_id, encoded_data_length);
1253 context_->preload_requests.Remove(fetch_event_id); 1249 context_->preload_requests.Remove(fetch_event_id);
1254 } 1250 }
1255 1251
1256 base::WeakPtr<ServiceWorkerContextClient> 1252 base::WeakPtr<ServiceWorkerContextClient>
1257 ServiceWorkerContextClient::GetWeakPtr() { 1253 ServiceWorkerContextClient::GetWeakPtr() {
1258 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 1254 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
1259 DCHECK(context_); 1255 DCHECK(context_);
1260 return context_->weak_factory.GetWeakPtr(); 1256 return context_->weak_factory.GetWeakPtr();
1261 } 1257 }
1262 1258
1263 } // namespace content 1259 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698