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

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

Issue 2019613003: ServiceWorker: Bypass SW when the script doesn't have fetch handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the nits Created 4 years, 7 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
« no previous file with comments | « no previous file | content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7b9b35c2f65f13ebd0b38aab55b6107763f09df3..1187e94b3c0af5e11cd92a30733303c54dd10fcc 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -26,6 +26,23 @@
namespace content {
+namespace {
+
+bool MaybeForwardToServiceWorker(ServiceWorkerURLRequestJob* job,
+ const ServiceWorkerVersion* version) {
+ DCHECK(job);
+ DCHECK(version);
+ if (version->has_fetch_handler()) {
+ job->ForwardToServiceWorker();
+ return true;
+ }
+
+ job->FallbackToNetwork();
+ return false;
+}
+
+} // namespace
+
ServiceWorkerControlleeRequestHandler::ServiceWorkerControlleeRequestHandler(
base::WeakPtr<ServiceWorkerContextCore> context,
base::WeakPtr<ServiceWorkerProviderHost> provider_host,
@@ -251,15 +268,15 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
}
ServiceWorkerMetrics::CountControlledPageLoad(stripped_url_);
+ bool is_forwarded =
+ MaybeForwardToServiceWorker(job_.get(), active_version.get());
- job_->ForwardToServiceWorker();
TRACE_EVENT_ASYNC_END2(
"ServiceWorker",
"ServiceWorkerControlleeRequestHandler::PrepareForMainResource",
- job_.get(),
- "Status", status,
- "Info",
- "Forwarded to the ServiceWorker");
+ job_.get(), "Status", status, "Info",
+ (is_forwarded) ? "Forwarded to the ServiceWorker"
+ : "Skipped the ServiceWorker which has no fetch handler");
}
void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
@@ -282,7 +299,8 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
provider_host_->AssociateRegistration(registration,
false /* notify_controllerchange */);
- job_->ForwardToServiceWorker();
+
+ MaybeForwardToServiceWorker(job_.get(), version);
}
void ServiceWorkerControlleeRequestHandler::DidUpdateRegistration(
@@ -352,7 +370,7 @@ void ServiceWorkerControlleeRequestHandler::PrepareForSubResource() {
DCHECK(job_.get());
DCHECK(context_);
DCHECK(provider_host_->active_version());
- job_->ForwardToServiceWorker();
+ MaybeForwardToServiceWorker(job_.get(), provider_host_->active_version());
}
void ServiceWorkerControlleeRequestHandler::OnPrepareToRestart() {
« no previous file with comments | « no previous file | content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698