Chromium Code Reviews| 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 64442b5bf60a80ec5135b3ec0dd4aa0aed6b2e44..8ce2f1e862a64f8d29787988fc76482a144fd6ab 100644 |
| --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc |
| +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc |
| @@ -4,6 +4,7 @@ |
| #include "content/browser/service_worker/service_worker_controllee_request_handler.h" |
| +#include "base/debug/trace_event.h" |
| #include "content/browser/service_worker/service_worker_context_core.h" |
| #include "content/browser/service_worker/service_worker_metrics.h" |
| #include "content/browser/service_worker/service_worker_provider_host.h" |
| @@ -115,6 +116,13 @@ void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( |
| const GURL& url) { |
| DCHECK(job_.get()); |
| DCHECK(context_); |
| + TRACE_EVENT_ASYNC_BEGIN1( |
| + "ServiceWorker", |
| + "ServiceWorkerControlleeRequestHandler::PrepareForMainResource -> " |
|
horo
2014/09/05 11:02:32
ServiceWorkerControlleeRequestHandler::PrepareForM
shimazu
2014/09/08 07:04:46
Done.
|
| + "ServiceWOrkerControlleeRequestHandler::" |
| + "DidLookupRegistrationForMainResource", |
| + job_.get(), |
| + "URL", url.spec()); |
| // The corresponding provider_host may already have associated a registration |
| // in redirect case, unassociate it now. |
| provider_host_->UnassociateRegistration(); |
| @@ -134,6 +142,13 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource( |
| DCHECK(job_.get()); |
| if (status != SERVICE_WORKER_OK) { |
| job_->FallbackToNetwork(); |
| + TRACE_EVENT_ASYNC_END1( |
| + "ServiceWorker", |
| + "ServiceWorkerControlleeRequestHandler::PrepareForMainResource -> " |
|
horo
2014/09/05 11:02:32
ditto
shimazu
2014/09/08 07:04:45
Done.
|
| + "ServiceWOrkerControlleeRequestHandler::" |
| + "DidLookupRegistrationForMainResource", |
| + job_.get(), |
| + "Status", status); |
| return; |
| } |
| DCHECK(registration.get()); |
| @@ -158,17 +173,40 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource( |
| weak_factory_.GetWeakPtr(), |
| registration, |
| active_version)); |
| + TRACE_EVENT_ASYNC_END2( |
| + "ServiceWorker", |
| + "ServiceWorkerControlleeRequestHandler::" |
|
horo
2014/09/05 11:02:32
ditto
shimazu
2014/09/08 07:04:45
Done.
|
| + "PrepareForMainResource->DidLookupRegistrationForMainResource", |
| + job_.get(), |
| + "Status", status, |
| + "Info", "Wait until finished SW activation"); |
| return; |
| } |
| if (!active_version.get() || |
| active_version->status() != ServiceWorkerVersion::ACTIVATED) { |
| job_->FallbackToNetwork(); |
| + TRACE_EVENT_ASYNC_END2( |
| + "ServiceWorker", |
| + "ServiceWorkerControlleeRequestHandler::" |
| + "PrepareForMainResource->DidLookupRegistrationForMainResource", |
|
horo
2014/09/05 11:02:32
ditto
shimazu
2014/09/08 07:04:46
Done.
|
| + job_.get(), |
| + "Status", status, |
| + "Info", |
| + "ServiceWorkerVersion is not available, so falling back to network"); |
| return; |
| } |
| provider_host_->AssociateRegistration(registration.get()); |
| job_->ForwardToServiceWorker(); |
| + TRACE_EVENT_ASYNC_END2( |
| + "ServiceWorker", |
| + "ServiceWorkerControlleeRequestHandler::" |
| + "PrepareForMainResource->DidLookupRegistrationForMainResource", |
|
horo
2014/09/05 11:02:32
ditto
shimazu
2014/09/08 07:04:46
Done.
|
| + job_.get(), |
| + "Status", status, |
| + "Info", |
| + "Forwarded to the ServiceWorker"); |
| } |
| void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged( |