diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 16:35:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 15:45:54 +0000 |
| commit | 32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch) | |
| tree | eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/base/message_loop | |
| parent | 99677208ff3b216fdfec551fbe548da5520cd6fb (diff) | |
| download | qtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz | |
BASELINE: Update Chromium to 87.0.4280.67
Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/message_loop')
| -rw-r--r-- | chromium/base/message_loop/message_pump_for_ui.h | 4 | ||||
| -rw-r--r-- | chromium/base/message_loop/message_pump_win.cc | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/chromium/base/message_loop/message_pump_for_ui.h b/chromium/base/message_loop/message_pump_for_ui.h index 27f18db1335..1eb7da02ee0 100644 --- a/chromium/base/message_loop/message_pump_for_ui.h +++ b/chromium/base/message_loop/message_pump_for_ui.h @@ -20,7 +20,7 @@ // No MessagePumpForUI, see below. #elif defined(USE_GLIB) #include "base/message_loop/message_pump_glib.h" -#elif defined(OS_LINUX) || defined(OS_BSD) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/message_loop/message_pump_libevent.h" #elif defined(OS_FUCHSIA) #include "base/message_loop/message_pump_fuchsia.h" @@ -44,7 +44,7 @@ using MessagePumpForUI = MessagePump; // TODO(abarth): Figure out if we need this. #elif defined(USE_GLIB) using MessagePumpForUI = MessagePumpGlib; -#elif defined(OS_LINUX) || defined(OS_BSD) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using MessagePumpForUI = MessagePumpLibevent; #elif defined(OS_FUCHSIA) using MessagePumpForUI = MessagePumpFuchsia; diff --git a/chromium/base/message_loop/message_pump_win.cc b/chromium/base/message_loop/message_pump_win.cc index 2a286b4d269..2ba623bd01a 100644 --- a/chromium/base/message_loop/message_pump_win.cc +++ b/chromium/base/message_loop/message_pump_win.cc @@ -15,6 +15,11 @@ #include "base/numerics/ranges.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/base_tracing.h" +#include "base/tracing_buildflags.h" + +#if BUILDFLAG(ENABLE_BASE_TRACING) +#include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_message_pump.pbzero.h" +#endif // BUILDFLAG(ENABLE_BASE_TRACING) namespace base { @@ -483,9 +488,13 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() { // PeekMessage can run a message if there are sent messages, trace that and // emit the boolean param to see if it ever janks independently (ref. // comment on GetQueueStatus). - TRACE_EVENT1("base", - "MessagePumpForUI::ProcessNextWindowsMessage PeekMessage", - "sent_messages_in_queue", more_work_is_plausible); + TRACE_EVENT( + "base", "MessagePumpForUI::ProcessNextWindowsMessage PeekMessage", + [&](perfetto::EventContext ctx) { + perfetto::protos::pbzero::ChromeMessagePump* msg_pump_data = + ctx.event()->set_chrome_message_pump(); + msg_pump_data->set_sent_messages_in_queue(more_work_is_plausible); + }); has_msg = ::PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE) != FALSE; } if (has_msg) |