| Index: content/renderer/service_worker/service_worker_context_client.cc
|
| diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
|
| index ad138a310acd926e52a6e23e1661c0d9a26eb9e8..040e637f636b03890fecb1a186fd5da460df52d3 100644
|
| --- a/content/renderer/service_worker/service_worker_context_client.cc
|
| +++ b/content/renderer/service_worker/service_worker_context_client.cc
|
| @@ -286,7 +286,7 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
|
| const ResourceResponseHead& response_head) override {
|
| // This will delete |this|.
|
| ReportErrorToClient(
|
| - "Service Worker navigation preload doesn't suport redirect.");
|
| + "Service Worker navigation preload doesn't support redirects.");
|
| }
|
|
|
| void OnDataDownloaded(int64_t data_length,
|
| @@ -297,7 +297,7 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
|
| void OnReceiveCachedMetadata(const std::vector<uint8_t>& data) override {}
|
|
|
| void OnTransferSizeUpdated(int32_t transfer_size_diff) override {
|
| - NOTREACHED();
|
| + // TODO(horo): Send this transfer size update notification to DevTools.
|
| }
|
|
|
| void OnStartLoadingResponseBody(
|
| @@ -319,7 +319,8 @@ class ServiceWorkerContextClient::NavigationPreloadRequest final
|
| if (!client)
|
| return;
|
| // This will delete |this|.
|
| - client->OnNavigationPreloadComplete(fetch_event_id_);
|
| + client->OnNavigationPreloadComplete(fetch_event_id_,
|
| + status.encoded_data_length);
|
| }
|
|
|
| private:
|
| @@ -952,11 +953,12 @@ void ServiceWorkerContextClient::DispatchFetchEvent(
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| const DispatchFetchEventCallback& callback) {
|
| - std::unique_ptr<NavigationPreloadRequest> preload_request =
|
| - preload_handle
|
| - ? base::MakeUnique<NavigationPreloadRequest>(
|
| - fetch_event_id, request.url, std::move(preload_handle))
|
| - : nullptr;
|
| + std::unique_ptr<NavigationPreloadRequest> preload_request;
|
| + if (preload_handle) {
|
| + proxy_->onNavigationPreloadSent(fetch_event_id, request.url);
|
| + preload_request = base::MakeUnique<NavigationPreloadRequest>(
|
| + fetch_event_id, request.url, std::move(preload_handle));
|
| + }
|
| const bool navigation_preload_sent = !!preload_request;
|
| blink::WebServiceWorkerRequest webRequest;
|
| TRACE_EVENT0("ServiceWorker",
|
| @@ -1245,7 +1247,9 @@ void ServiceWorkerContextClient::OnNavigationPreloadError(
|
| }
|
|
|
| void ServiceWorkerContextClient::OnNavigationPreloadComplete(
|
| - int fetch_event_id) {
|
| + int fetch_event_id,
|
| + int64_t encoded_data_length) {
|
| + proxy_->onNavigationPreloadCompleted(fetch_event_id, encoded_data_length);
|
| context_->preload_requests.Remove(fetch_event_id);
|
| }
|
|
|
|
|