Byron Campen
250d15b49e
Upstream commit: https://webrtc.googlesource.com/src/+/ad9c17b6780585d7f80c431ac158e9e888cd5cce Add queue_name() to the TaskQueueBase interface Add a queue_name() getter to the TaskQueueBase interface to allow retrieval of the name assigned to a task queue. The getter returns an absl::string_view and by default will return value of "unnamed". Update the platform-specific TaskQueue implementations, refactor SimulatedTaskQueue to use std::string, update MockTaskQueueBase and various other test implementations. Bug: webrtc:500769400 Change-Id: I93d4cb3b48ba47f340fee1b2cec2c02767e3fcf0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/462523 Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47372}
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Mon, 24 Oct 2022 14:03:00 -0500
|
|
Subject: Bug 1797161 - pt3 - add static_assert to ensure we don't include
|
|
task_queue_win.cc in Mozilla builds. r?ng!
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D160117
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/50b15e036924203147e34ec20e2689fe4a847645
|
|
---
|
|
rtc_base/task_queue_win.cc | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc
|
|
index 99daf8e814..830a6ff989 100644
|
|
--- a/rtc_base/task_queue_win.cc
|
|
+++ b/rtc_base/task_queue_win.cc
|
|
@@ -8,6 +8,15 @@
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
+// Mozilla - this file should not be included in Mozilla builds until
|
|
+// win32k API usage is removed. This was once done in Bug 1395259, but
|
|
+// the upstreaming attempt stalled. Until win32k usage is officially
|
|
+// removed upstream, we have reverted to upstream's version of the file
|
|
+// (to reduce or elminate merge conflicts), and a static assert is
|
|
+// placed here to ensure this file isn't accidentally included in the
|
|
+// Mozilla build.
|
|
+static_assert(false, "This file should not be built, see Bug 1797161.");
|
|
+
|
|
#include "rtc_base/task_queue_win.h"
|
|
|
|
// clang-format off
|