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

Side by Side Diff: content/browser/service_worker/service_worker_context_request_handler.cc

Issue 1146253004: Add workerReady timing for ServiceWorker controlled requests [2/3] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/service_worker/service_worker_context_request_handler. h" 5 #include "content/browser/service_worker/service_worker_context_request_handler. h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "content/browser/service_worker/service_worker_context_core.h" 8 #include "content/browser/service_worker/service_worker_context_core.h"
9 #include "content/browser/service_worker/service_worker_provider_host.h" 9 #include "content/browser/service_worker/service_worker_provider_host.h"
10 #include "content/browser/service_worker/service_worker_read_from_cache_job.h" 10 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 // NULL means use the network. 91 // NULL means use the network.
92 return NULL; 92 return NULL;
93 } 93 }
94 94
95 void ServiceWorkerContextRequestHandler::GetExtraResponseInfo( 95 void ServiceWorkerContextRequestHandler::GetExtraResponseInfo(
96 bool* was_fetched_via_service_worker, 96 bool* was_fetched_via_service_worker,
97 bool* was_fallback_required_by_service_worker, 97 bool* was_fallback_required_by_service_worker,
98 GURL* original_url_via_service_worker, 98 GURL* original_url_via_service_worker,
99 blink::WebServiceWorkerResponseType* response_type_via_service_worker, 99 blink::WebServiceWorkerResponseType* response_type_via_service_worker,
100 base::TimeTicks* worker_start_time) const { 100 base::TimeTicks* worker_start_time,
101 base::TimeTicks* worker_ready_time) const {
101 *was_fetched_via_service_worker = false; 102 *was_fetched_via_service_worker = false;
102 *was_fallback_required_by_service_worker = false; 103 *was_fallback_required_by_service_worker = false;
103 *original_url_via_service_worker = GURL(); 104 *original_url_via_service_worker = GURL();
104 *response_type_via_service_worker = 105 *response_type_via_service_worker =
105 blink::WebServiceWorkerResponseTypeDefault; 106 blink::WebServiceWorkerResponseTypeDefault;
106 } 107 }
107 108
108 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache( 109 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache(
109 const GURL& url) { 110 const GURL& url) {
110 // We only write imports that occur during the initial eval. 111 // We only write imports that occur during the initial eval.
111 if (version_->status() != ServiceWorkerVersion::NEW && 112 if (version_->status() != ServiceWorkerVersion::NEW &&
112 version_->status() != ServiceWorkerVersion::INSTALLING) { 113 version_->status() != ServiceWorkerVersion::INSTALLING) {
113 return false; 114 return false;
114 } 115 }
115 return version_->script_cache_map()->LookupResourceId(url) == 116 return version_->script_cache_map()->LookupResourceId(url) ==
116 kInvalidServiceWorkerResponseId; 117 kInvalidServiceWorkerResponseId;
117 } 118 }
118 119
119 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache( 120 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache(
120 const GURL& url, int64* response_id_out) { 121 const GURL& url, int64* response_id_out) {
121 // We don't read from the script cache until the version is INSTALLED. 122 // We don't read from the script cache until the version is INSTALLED.
122 if (version_->status() == ServiceWorkerVersion::NEW || 123 if (version_->status() == ServiceWorkerVersion::NEW ||
123 version_->status() == ServiceWorkerVersion::INSTALLING) 124 version_->status() == ServiceWorkerVersion::INSTALLING)
124 return false; 125 return false;
125 *response_id_out = version_->script_cache_map()->LookupResourceId(url); 126 *response_id_out = version_->script_cache_map()->LookupResourceId(url);
126 return *response_id_out != kInvalidServiceWorkerResponseId; 127 return *response_id_out != kInvalidServiceWorkerResponseId;
127 } 128 }
128 129
129 } // namespace content 130 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698