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

Unified Diff: content/browser/service_worker/service_worker_controllee_request_handler.cc

Issue 2251633002: Use tri-state enum for the existence of Fetch Handler in ServiceWorkerVersion. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/status/existence/ Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 6312b57b09bc3c6d5e4a54f71489cc3e338156e3..bc5770780ea15d3a16c3de9a5cc3e48d3c924719 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -33,7 +33,10 @@ bool MaybeForwardToServiceWorker(ServiceWorkerURLRequestJob* job,
const ServiceWorkerVersion* version) {
DCHECK(job);
DCHECK(version);
- if (version->has_fetch_handler()) {
+ DCHECK_NE(version->fetch_handler_existence(),
+ ServiceWorkerVersion::FetchHandlerExistence::UNKNOWN);
+ if (version->fetch_handler_existence() ==
+ ServiceWorkerVersion::FetchHandlerExistence::EXISTS) {
job->ForwardToServiceWorker();
return true;
}
@@ -280,8 +283,13 @@ void ServiceWorkerControlleeRequestHandler::
return;
}
+ DCHECK_NE(active_version->fetch_handler_existence(),
+ ServiceWorkerVersion::FetchHandlerExistence::UNKNOWN);
+
ServiceWorkerMetrics::CountControlledPageLoad(
- stripped_url_, active_version->has_fetch_handler(), is_main_frame_load_);
+ stripped_url_, active_version->fetch_handler_existence() ==
+ ServiceWorkerVersion::FetchHandlerExistence::EXISTS,
+ is_main_frame_load_);
bool is_forwarded =
MaybeForwardToServiceWorker(job_.get(), active_version.get());
@@ -310,8 +318,12 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
return;
}
+ DCHECK_NE(version->fetch_handler_existence(),
+ ServiceWorkerVersion::FetchHandlerExistence::UNKNOWN);
ServiceWorkerMetrics::CountControlledPageLoad(
- stripped_url_, version->has_fetch_handler(), is_main_frame_load_);
+ stripped_url_, version->fetch_handler_existence() ==
+ ServiceWorkerVersion::FetchHandlerExistence::EXISTS,
+ is_main_frame_load_);
provider_host_->AssociateRegistration(registration,
false /* notify_controllerchange */);

Powered by Google App Engine
This is Rietveld 408576698