1904096 - GeckoTraceEvent.h is behind upstream libwebrtc (and should be un-formatted)

Status: RESOLVED FIXED

(Core :: WebRTC, task)

Description

[Michael Froman [:mjf]]

The v126 update requires changes to GeckoTraceEvent.h in order to build. GeckoTraceEvent.h has fallen behind the current version of rtc_base/trace_event.h. Also complicating applying upstream updates, the file was clang-formatted despite being listed in .clang-format-ignore. We need to un-format the file, and apply changes from upstream commits 802e8e5fdb, d7478a8453, and 9849bfdb10 to match libwebrtc's version.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1904096 - revert clang-formatting from GeckoTraceEvent.h r?ng!

This file is marked in .clang-format-ignore because it
is copied from libwebrtc. Formatting changes here make
it difficult to keep it in step with upstream changes.

The file now contains '// clang-format off' and
'// clang-format on' to help avoid this issue in the
future.

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1904096 - reflect libwebrtc commits 802e8e5fdb, d7478a8453, 9849bfdb10 in GeckoTraceEvent.h r?ng!

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/562736492281
revert clang-formatting from GeckoTraceEvent.h r=ng,profiler-reviewers,aabh
https://hg.mozilla.org/integration/autoland/rev/fb0e887ed58f
reflect libwebrtc commits 802e8e5fdb, d7478a8453, 9849bfdb10 in GeckoTraceEvent.h r=ng,profiler-reviewers,aabh

Comment 4

[Sandor Molnar[:smolnar]]

https://hg.mozilla.org/mozilla-central/rev/562736492281
https://hg.mozilla.org/mozilla-central/rev/fb0e887ed58f