Skip to content

GitLab

T
tangled
Commit ce0a584b authored by momohatt's avatar momohatt Committed by Commit Bot
Browse files
Options

Use TRACE_EVENT_WITH_FLOW for tracing ServiceWorkerContextClient events 

This patch makes it easier to track the events dispatched by ServiceWorkerContextClient,
similarly as https://chromium-review.googlesource.com/1156334 .

Events modified in this patch are as follows (in the order of appearance):
* ActivateEvent
* BackgroundFetchAbortEvent
* BackgroundFetchClickEvent
* BackgroundFetchFailEvent
* BackgroundFetchedEvent
* DispatchCookieChangeEvent
* ExtendableMessageEvent
* InstallEvent
* NotificationClickEvent
* NotificationCloseEvent
* PushEvent
* SyncEvent
* AbortPaymentEvent
* CanMakePaymentEvent
* PaymentRequestEvent
* OnNavigationPreload

Bug: 860394
Change-Id: Ief11e8a755256ccba5c066d94f3481bd52ed2bcb
Reviewed-on: https://chromium-review.googlesource.com/1159939Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Commit-Queue: Momoko Hattori <momohatt@google.com>
Cr-Commit-Position: refs/heads/master@{#580135}
parent ab383ab3
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 121 deletions
content/renderer/service_worker/service_worker_context_client.cc
View file @ ce0a584b
...@@ -974,10 +974,12 @@ void ServiceWorkerContextClient::DidHandleActivateEvent( ...@@ -974,10 +974,12 @@ void ServiceWorkerContextClient::DidHandleActivateEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1("ServiceWorker",
"ServiceWorkerContextClient::DidHandleActivateEvent", "event_id", "ServiceWorkerContextClient::DidHandleActivateEvent",
request_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->activate_event_callbacks, RunEventCallback(&context_->activate_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -987,10 +989,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchAbortEvent( ...@@ -987,10 +989,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchAbortEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleBackgroundFetchAbortEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleBackgroundFetchAbortEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->background_fetch_abort_event_callbacks, RunEventCallback(&context_->background_fetch_abort_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1000,10 +1005,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchClickEvent( ...@@ -1000,10 +1005,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchClickEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleBackgroundFetchClickEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleBackgroundFetchClickEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->background_fetch_click_event_callbacks, RunEventCallback(&context_->background_fetch_click_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1013,10 +1021,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchFailEvent( ...@@ -1013,10 +1021,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchFailEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleBackgroundFetchFailEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleBackgroundFetchFailEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->background_fetch_fail_event_callbacks, RunEventCallback(&context_->background_fetch_fail_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1026,10 +1037,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchedEvent( ...@@ -1026,10 +1037,13 @@ void ServiceWorkerContextClient::DidHandleBackgroundFetchedEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleBackgroundFetchedEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleBackgroundFetchedEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->background_fetched_event_callbacks, RunEventCallback(&context_->background_fetched_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1039,10 +1053,12 @@ void ServiceWorkerContextClient::DidHandleCookieChangeEvent( ...@@ -1039,10 +1053,12 @@ void ServiceWorkerContextClient::DidHandleCookieChangeEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleCookieChangeEvent", "ServiceWorker", "ServiceWorkerContextClient::DidHandleCookieChangeEvent",
"event_id", request_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->cookie_change_event_callbacks, RunEventCallback(&context_->cookie_change_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1052,10 +1068,13 @@ void ServiceWorkerContextClient::DidHandleExtendableMessageEvent( ...@@ -1052,10 +1068,13 @@ void ServiceWorkerContextClient::DidHandleExtendableMessageEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleExtendableMessageEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleExtendableMessageEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->message_event_callbacks, RunEventCallback(&context_->message_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1065,10 +1084,12 @@ void ServiceWorkerContextClient::DidHandleInstallEvent( ...@@ -1065,10 +1084,12 @@ void ServiceWorkerContextClient::DidHandleInstallEvent(
int event_id, int event_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1("ServiceWorker",
"ServiceWorkerContextClient::DidHandleInstallEvent", "event_id", "ServiceWorkerContextClient::DidHandleInstallEvent",
event_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->install_event_callbacks, RunEventCallback(&context_->install_event_callbacks,
context_->timeout_timer.get(), event_id, status, context_->timeout_timer.get(), event_id, status,
proxy_->HasFetchEventHandler(), proxy_->HasFetchEventHandler(),
...@@ -1179,10 +1200,13 @@ void ServiceWorkerContextClient::DidHandleNotificationClickEvent( ...@@ -1179,10 +1200,13 @@ void ServiceWorkerContextClient::DidHandleNotificationClickEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleNotificationClickEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleNotificationClickEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->notification_click_event_callbacks, RunEventCallback(&context_->notification_click_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1192,10 +1216,13 @@ void ServiceWorkerContextClient::DidHandleNotificationCloseEvent( ...@@ -1192,10 +1216,13 @@ void ServiceWorkerContextClient::DidHandleNotificationCloseEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleNotificationCloseEvent", "ServiceWorker",
"event_id", request_id, "status", "ServiceWorkerContextClient::DidHandleNotificationCloseEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->notification_close_event_callbacks, RunEventCallback(&context_->notification_close_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1205,10 +1232,12 @@ void ServiceWorkerContextClient::DidHandlePushEvent( ...@@ -1205,10 +1232,12 @@ void ServiceWorkerContextClient::DidHandlePushEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1("ServiceWorker",
"ServiceWorkerContextClient::DidHandlePushEvent", "event_id", "ServiceWorkerContextClient::DidHandlePushEvent",
request_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->push_event_callbacks, RunEventCallback(&context_->push_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1218,10 +1247,12 @@ void ServiceWorkerContextClient::DidHandleSyncEvent( ...@@ -1218,10 +1247,12 @@ void ServiceWorkerContextClient::DidHandleSyncEvent(
int request_id, int request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1("ServiceWorker",
"ServiceWorkerContextClient::DidHandleSyncEvent", "event_id", "ServiceWorkerContextClient::DidHandleSyncEvent",
request_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
RunEventCallback(&context_->sync_event_callbacks, RunEventCallback(&context_->sync_event_callbacks,
context_->timeout_timer.get(), request_id, status, context_->timeout_timer.get(), request_id, status,
base::Time::FromDoubleT(event_dispatch_time)); base::Time::FromDoubleT(event_dispatch_time));
...@@ -1231,9 +1262,11 @@ void ServiceWorkerContextClient::RespondToAbortPaymentEvent( ...@@ -1231,9 +1262,11 @@ void ServiceWorkerContextClient::RespondToAbortPaymentEvent(
int event_id, int event_id,
bool payment_aborted, bool payment_aborted,
double dispatch_event_time) { double dispatch_event_time) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::RespondToAbortPaymentEvent", "ServiceWorker", "ServiceWorkerContextClient::RespondToAbortPaymentEvent",
"event_id", event_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(base::ContainsKey(context_->abort_payment_result_callbacks, event_id)); DCHECK(base::ContainsKey(context_->abort_payment_result_callbacks, event_id));
const payments::mojom::PaymentHandlerResponseCallbackPtr& result_callback = const payments::mojom::PaymentHandlerResponseCallbackPtr& result_callback =
context_->abort_payment_result_callbacks[event_id]; context_->abort_payment_result_callbacks[event_id];
...@@ -1246,10 +1279,12 @@ void ServiceWorkerContextClient::DidHandleAbortPaymentEvent( ...@@ -1246,10 +1279,12 @@ void ServiceWorkerContextClient::DidHandleAbortPaymentEvent(
int event_id, int event_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double dispatch_event_time) { double dispatch_event_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleAbortPaymentEvent", "ServiceWorker", "ServiceWorkerContextClient::DidHandleAbortPaymentEvent",
"event_id", event_id, "status", TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
if (RunEventCallback(&context_->abort_payment_event_callbacks, if (RunEventCallback(&context_->abort_payment_event_callbacks,
context_->timeout_timer.get(), event_id, status, context_->timeout_timer.get(), event_id, status,
base::Time::FromDoubleT(dispatch_event_time))) { base::Time::FromDoubleT(dispatch_event_time))) {
...@@ -1261,9 +1296,12 @@ void ServiceWorkerContextClient::RespondToCanMakePaymentEvent( ...@@ -1261,9 +1296,12 @@ void ServiceWorkerContextClient::RespondToCanMakePaymentEvent(
int event_id, int event_id,
bool can_make_payment, bool can_make_payment,
double dispatch_event_time) { double dispatch_event_time) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::RespondToCanMakePaymentEvent", "ServiceWorker",
"event_id", event_id); "ServiceWorkerContextClient::RespondToCanMakePaymentEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK( DCHECK(
base::ContainsKey(context_->can_make_payment_result_callbacks, event_id)); base::ContainsKey(context_->can_make_payment_result_callbacks, event_id));
const payments::mojom::PaymentHandlerResponseCallbackPtr& result_callback = const payments::mojom::PaymentHandlerResponseCallbackPtr& result_callback =
...@@ -1277,10 +1315,13 @@ void ServiceWorkerContextClient::DidHandleCanMakePaymentEvent( ...@@ -1277,10 +1315,13 @@ void ServiceWorkerContextClient::DidHandleCanMakePaymentEvent(
int event_id, int event_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double dispatch_event_time) { double dispatch_event_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandleCanMakePaymentEvent", "ServiceWorker",
"event_id", event_id, "status", "ServiceWorkerContextClient::DidHandleCanMakePaymentEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
if (RunEventCallback(&context_->can_make_payment_event_callbacks, if (RunEventCallback(&context_->can_make_payment_event_callbacks,
context_->timeout_timer.get(), event_id, status, context_->timeout_timer.get(), event_id, status,
base::Time::FromDoubleT(dispatch_event_time))) { base::Time::FromDoubleT(dispatch_event_time))) {
...@@ -1292,9 +1333,12 @@ void ServiceWorkerContextClient::RespondToPaymentRequestEvent( ...@@ -1292,9 +1333,12 @@ void ServiceWorkerContextClient::RespondToPaymentRequestEvent(
int payment_request_id, int payment_request_id,
const blink::WebPaymentHandlerResponse& web_response, const blink::WebPaymentHandlerResponse& web_response,
double dispatch_event_time) { double dispatch_event_time) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::RespondToPaymentRequestEvent", "ServiceWorker",
"event_id", payment_request_id); "ServiceWorkerContextClient::RespondToPaymentRequestEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(payment_request_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(base::ContainsKey(context_->payment_response_callbacks, DCHECK(base::ContainsKey(context_->payment_response_callbacks,
payment_request_id)); payment_request_id));
const payments::mojom::PaymentHandlerResponseCallbackPtr& response_callback = const payments::mojom::PaymentHandlerResponseCallbackPtr& response_callback =
...@@ -1312,10 +1356,13 @@ void ServiceWorkerContextClient::DidHandlePaymentRequestEvent( ...@@ -1312,10 +1356,13 @@ void ServiceWorkerContextClient::DidHandlePaymentRequestEvent(
int payment_request_id, int payment_request_id,
blink::mojom::ServiceWorkerEventStatus status, blink::mojom::ServiceWorkerEventStatus status,
double event_dispatch_time) { double event_dispatch_time) {
TRACE_EVENT2("ServiceWorker", TRACE_EVENT_WITH_FLOW1(
"ServiceWorkerContextClient::DidHandlePaymentRequestEvent", "ServiceWorker",
"event_id", payment_request_id, "status", "ServiceWorkerContextClient::DidHandlePaymentRequestEvent",
ServiceWorkerUtils::MojoEnumToString(status)); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(payment_request_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status",
ServiceWorkerUtils::MojoEnumToString(status));
if (RunEventCallback(&context_->payment_request_event_callbacks, if (RunEventCallback(&context_->payment_request_event_callbacks,
context_->timeout_timer.get(), payment_request_id, context_->timeout_timer.get(), payment_request_id,
status, base::Time::FromDoubleT(event_dispatch_time))) { status, base::Time::FromDoubleT(event_dispatch_time))) {
...@@ -1437,8 +1484,11 @@ void ServiceWorkerContextClient::DispatchSyncEvent( ...@@ -1437,8 +1484,11 @@ void ServiceWorkerContextClient::DispatchSyncEvent(
int request_id = context_->timeout_timer->StartEventWithCustomTimeout( int request_id = context_->timeout_timer->StartEventWithCustomTimeout(
CreateAbortCallback(&context_->sync_event_callbacks), timeout); CreateAbortCallback(&context_->sync_event_callbacks), timeout);
context_->sync_event_callbacks.emplace(request_id, std::move(callback)); context_->sync_event_callbacks.emplace(request_id, std::move(callback));
TRACE_EVENT1("ServiceWorker", "ServiceWorkerContextClient::DispatchSyncEvent", TRACE_EVENT_WITH_FLOW0("ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchSyncEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
// TODO(jkarlin): Make this blink::WebString::FromUTF8Lenient once // TODO(jkarlin): Make this blink::WebString::FromUTF8Lenient once
// https://crrev.com/1768063002/ lands. // https://crrev.com/1768063002/ lands.
...@@ -1455,9 +1505,11 @@ void ServiceWorkerContextClient::DispatchAbortPaymentEvent( ...@@ -1455,9 +1505,11 @@ void ServiceWorkerContextClient::DispatchAbortPaymentEvent(
std::move(callback)); std::move(callback));
context_->abort_payment_result_callbacks.emplace( context_->abort_payment_result_callbacks.emplace(
event_id, std::move(response_callback)); event_id, std::move(response_callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchAbortPaymentEvent", "ServiceWorker", "ServiceWorkerContextClient::DispatchAbortPaymentEvent",
"event_id", event_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->DispatchAbortPaymentEvent(event_id); proxy_->DispatchAbortPaymentEvent(event_id);
} }
...@@ -1471,9 +1523,12 @@ void ServiceWorkerContextClient::DispatchCanMakePaymentEvent( ...@@ -1471,9 +1523,12 @@ void ServiceWorkerContextClient::DispatchCanMakePaymentEvent(
std::move(callback)); std::move(callback));
context_->can_make_payment_result_callbacks.emplace( context_->can_make_payment_result_callbacks.emplace(
event_id, std::move(response_callback)); event_id, std::move(response_callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchCanMakePaymentEvent", "ServiceWorker",
"event_id", event_id); "ServiceWorkerContextClient::DispatchCanMakePaymentEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebCanMakePaymentEventData webEventData = blink::WebCanMakePaymentEventData webEventData =
mojo::ConvertTo<blink::WebCanMakePaymentEventData>(std::move(eventData)); mojo::ConvertTo<blink::WebCanMakePaymentEventData>(std::move(eventData));
...@@ -1490,9 +1545,12 @@ void ServiceWorkerContextClient::DispatchPaymentRequestEvent( ...@@ -1490,9 +1545,12 @@ void ServiceWorkerContextClient::DispatchPaymentRequestEvent(
std::move(callback)); std::move(callback));
context_->payment_response_callbacks.emplace(event_id, context_->payment_response_callbacks.emplace(event_id,
std::move(response_callback)); std::move(response_callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchPaymentRequestEvent", "ServiceWorker",
"event_id", event_id); "ServiceWorkerContextClient::DispatchPaymentRequestEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebPaymentRequestEventData webEventData = blink::WebPaymentRequestEventData webEventData =
mojo::ConvertTo<blink::WebPaymentRequestEventData>(std::move(eventData)); mojo::ConvertTo<blink::WebPaymentRequestEventData>(std::move(eventData));
...@@ -1520,9 +1578,11 @@ void ServiceWorkerContextClient::DispatchActivateEvent( ...@@ -1520,9 +1578,11 @@ void ServiceWorkerContextClient::DispatchActivateEvent(
int request_id = context_->timeout_timer->StartEvent( int request_id = context_->timeout_timer->StartEvent(
CreateAbortCallback(&context_->activate_event_callbacks)); CreateAbortCallback(&context_->activate_event_callbacks));
context_->activate_event_callbacks.emplace(request_id, std::move(callback)); context_->activate_event_callbacks.emplace(request_id, std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0("ServiceWorker",
"ServiceWorkerContextClient::DispatchActivateEvent", "ServiceWorkerContextClient::DispatchActivateEvent",
"request_id", request_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->DispatchActivateEvent(request_id); proxy_->DispatchActivateEvent(request_id);
} }
...@@ -1535,9 +1595,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchAbortEvent( ...@@ -1535,9 +1595,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchAbortEvent(
CreateAbortCallback(&context_->background_fetch_abort_event_callbacks)); CreateAbortCallback(&context_->background_fetch_abort_event_callbacks));
context_->background_fetch_abort_event_callbacks.emplace(request_id, context_->background_fetch_abort_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchBackgroundFetchAbortEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchBackgroundFetchAbortEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches( blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches(
fetches.size()); fetches.size());
...@@ -1559,9 +1622,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchClickEvent( ...@@ -1559,9 +1622,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchClickEvent(
CreateAbortCallback(&context_->background_fetch_click_event_callbacks)); CreateAbortCallback(&context_->background_fetch_click_event_callbacks));
context_->background_fetch_click_event_callbacks.emplace(request_id, context_->background_fetch_click_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchBackgroundFetchClickEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchBackgroundFetchClickEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
// TODO(peter): Use typemap when this is moved to blink-side. // TODO(peter): Use typemap when this is moved to blink-side.
blink::WebServiceWorkerContextProxy::BackgroundFetchState web_state = blink::WebServiceWorkerContextProxy::BackgroundFetchState web_state =
...@@ -1580,9 +1646,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchFailEvent( ...@@ -1580,9 +1646,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchFailEvent(
CreateAbortCallback(&context_->background_fetch_fail_event_callbacks)); CreateAbortCallback(&context_->background_fetch_fail_event_callbacks));
context_->background_fetch_fail_event_callbacks.emplace(request_id, context_->background_fetch_fail_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchBackgroundFetchFailEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchBackgroundFetchFailEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches( blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches(
fetches.size()); fetches.size());
...@@ -1605,9 +1674,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchedEvent( ...@@ -1605,9 +1674,12 @@ void ServiceWorkerContextClient::DispatchBackgroundFetchedEvent(
CreateAbortCallback(&context_->background_fetched_event_callbacks)); CreateAbortCallback(&context_->background_fetched_event_callbacks));
context_->background_fetched_event_callbacks.emplace(request_id, context_->background_fetched_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchBackgroundFetchedEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchBackgroundFetchedEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches( blink::WebVector<blink::WebBackgroundFetchSettledFetch> web_fetches(
fetches.size()); fetches.size());
...@@ -1645,9 +1717,11 @@ void ServiceWorkerContextClient::DispatchInstallEvent( ...@@ -1645,9 +1717,11 @@ void ServiceWorkerContextClient::DispatchInstallEvent(
int event_id = context_->timeout_timer->StartEvent(CreateAbortCallback( int event_id = context_->timeout_timer->StartEvent(CreateAbortCallback(
&context_->install_event_callbacks, false /* has_fetch_handler */)); &context_->install_event_callbacks, false /* has_fetch_handler */));
context_->install_event_callbacks.emplace(event_id, std::move(callback)); context_->install_event_callbacks.emplace(event_id, std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0("ServiceWorker",
"ServiceWorkerContextClient::DispatchInstallEvent", "event_id", "ServiceWorkerContextClient::DispatchInstallEvent",
event_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->DispatchInstallEvent(event_id); proxy_->DispatchInstallEvent(event_id);
} }
...@@ -1658,9 +1732,12 @@ void ServiceWorkerContextClient::DispatchExtendableMessageEvent( ...@@ -1658,9 +1732,12 @@ void ServiceWorkerContextClient::DispatchExtendableMessageEvent(
int request_id = context_->timeout_timer->StartEvent( int request_id = context_->timeout_timer->StartEvent(
CreateAbortCallback(&context_->message_event_callbacks)); CreateAbortCallback(&context_->message_event_callbacks));
context_->message_event_callbacks.emplace(request_id, std::move(callback)); context_->message_event_callbacks.emplace(request_id, std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchExtendableMessageEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchExtendableMessageEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
if (event->source_info_for_client) { if (event->source_info_for_client) {
blink::WebServiceWorkerClientInfo web_client = blink::WebServiceWorkerClientInfo web_client =
...@@ -1726,9 +1803,12 @@ void ServiceWorkerContextClient::DispatchNotificationClickEvent( ...@@ -1726,9 +1803,12 @@ void ServiceWorkerContextClient::DispatchNotificationClickEvent(
CreateAbortCallback(&context_->notification_click_event_callbacks)); CreateAbortCallback(&context_->notification_click_event_callbacks));
context_->notification_click_event_callbacks.emplace(request_id, context_->notification_click_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchNotificationClickEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchNotificationClickEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
blink::WebString web_reply; blink::WebString web_reply;
if (reply) if (reply)
...@@ -1747,9 +1827,12 @@ void ServiceWorkerContextClient::DispatchNotificationCloseEvent( ...@@ -1747,9 +1827,12 @@ void ServiceWorkerContextClient::DispatchNotificationCloseEvent(
CreateAbortCallback(&context_->notification_close_event_callbacks)); CreateAbortCallback(&context_->notification_close_event_callbacks));
context_->notification_close_event_callbacks.emplace(request_id, context_->notification_close_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchNotificationCloseEvent", "ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchNotificationCloseEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->DispatchNotificationCloseEvent( proxy_->DispatchNotificationCloseEvent(
request_id, blink::WebString::FromUTF8(notification_id), request_id, blink::WebString::FromUTF8(notification_id),
ToWebNotificationData(notification_data)); ToWebNotificationData(notification_data));
...@@ -1762,8 +1845,11 @@ void ServiceWorkerContextClient::DispatchPushEvent( ...@@ -1762,8 +1845,11 @@ void ServiceWorkerContextClient::DispatchPushEvent(
CreateAbortCallback(&context_->push_event_callbacks), CreateAbortCallback(&context_->push_event_callbacks),
base::TimeDelta::FromSeconds(mojom::kPushEventTimeoutSeconds)); base::TimeDelta::FromSeconds(mojom::kPushEventTimeoutSeconds));
context_->push_event_callbacks.emplace(request_id, std::move(callback)); context_->push_event_callbacks.emplace(request_id, std::move(callback));
TRACE_EVENT1("ServiceWorker", "ServiceWorkerContextClient::DispatchPushEvent", TRACE_EVENT_WITH_FLOW0("ServiceWorker",
"request_id", request_id); "ServiceWorkerContextClient::DispatchPushEvent",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
// Only set data to be a valid string if the payload had decrypted data. // Only set data to be a valid string if the payload had decrypted data.
blink::WebString data; blink::WebString data;
...@@ -1780,9 +1866,11 @@ void ServiceWorkerContextClient::DispatchCookieChangeEvent( ...@@ -1780,9 +1866,11 @@ void ServiceWorkerContextClient::DispatchCookieChangeEvent(
CreateAbortCallback(&context_->cookie_change_event_callbacks)); CreateAbortCallback(&context_->cookie_change_event_callbacks));
context_->cookie_change_event_callbacks.emplace(request_id, context_->cookie_change_event_callbacks.emplace(request_id,
std::move(callback)); std::move(callback));
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::DispatchCookieChangeEvent", "ServiceWorker", "ServiceWorkerContextClient::DispatchCookieChangeEvent",
"request_id", request_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(request_id)),
TRACE_EVENT_FLAG_FLOW_OUT);
// After onion-souping, the conversion below will be done by mojo directly. // After onion-souping, the conversion below will be done by mojo directly.
DCHECK(!cookie.IsHttpOnly()); DCHECK(!cookie.IsHttpOnly());
...@@ -1816,9 +1904,12 @@ void ServiceWorkerContextClient::OnNavigationPreloadResponse( ...@@ -1816,9 +1904,12 @@ void ServiceWorkerContextClient::OnNavigationPreloadResponse(
int fetch_event_id, int fetch_event_id,
std::unique_ptr<blink::WebURLResponse> response, std::unique_ptr<blink::WebURLResponse> response,
std::unique_ptr<blink::WebDataConsumerHandle> data_consumer_handle) { std::unique_ptr<blink::WebDataConsumerHandle> data_consumer_handle) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::OnNavigationPreloadResponse", "ServiceWorker",
"event_id", fetch_event_id); "ServiceWorkerContextClient::OnNavigationPreloadResponse",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(fetch_event_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->OnNavigationPreloadResponse(fetch_event_id, std::move(response), proxy_->OnNavigationPreloadResponse(fetch_event_id, std::move(response),
std::move(data_consumer_handle)); std::move(data_consumer_handle));
} }
...@@ -1826,9 +1917,11 @@ void ServiceWorkerContextClient::OnNavigationPreloadResponse( ...@@ -1826,9 +1917,11 @@ void ServiceWorkerContextClient::OnNavigationPreloadResponse(
void ServiceWorkerContextClient::OnNavigationPreloadError( void ServiceWorkerContextClient::OnNavigationPreloadError(
int fetch_event_id, int fetch_event_id,
std::unique_ptr<blink::WebServiceWorkerError> error) { std::unique_ptr<blink::WebServiceWorkerError> error) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0("ServiceWorker",
"ServiceWorkerContextClient::OnNavigationPreloadError", "ServiceWorkerContextClient::OnNavigationPreloadError",
"event_id", fetch_event_id); TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(fetch_event_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->OnNavigationPreloadError(fetch_event_id, std::move(error)); proxy_->OnNavigationPreloadError(fetch_event_id, std::move(error));
context_->preload_requests.Remove(fetch_event_id); context_->preload_requests.Remove(fetch_event_id);
} }
...@@ -1839,9 +1932,12 @@ void ServiceWorkerContextClient::OnNavigationPreloadComplete( ...@@ -1839,9 +1932,12 @@ void ServiceWorkerContextClient::OnNavigationPreloadComplete(
int64_t encoded_data_length, int64_t encoded_data_length,
int64_t encoded_body_length, int64_t encoded_body_length,
int64_t decoded_body_length) { int64_t decoded_body_length) {
TRACE_EVENT1("ServiceWorker", TRACE_EVENT_WITH_FLOW0(
"ServiceWorkerContextClient::OnNavigationPreloadComplete", "ServiceWorker",
"event_id", fetch_event_id); "ServiceWorkerContextClient::OnNavigationPreloadComplete",
TRACE_ID_WITH_SCOPE(kServiceWorkerContextClientScope,
TRACE_ID_LOCAL(fetch_event_id)),
TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT);
proxy_->OnNavigationPreloadComplete(fetch_event_id, completion_time, proxy_->OnNavigationPreloadComplete(fetch_event_id, completion_time,
encoded_data_length, encoded_body_length, encoded_data_length, encoded_body_length,
decoded_body_length); decoded_body_length);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment