We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Thu, 29 Aug 2024 08:31:00 +0000
|
|
Subject: Bug 1914837 - Always initialize DesktopCapturer::pid.
|
|
r=webrtc-reviewers,ng
|
|
|
|
This member is patched on top of libwebrtc. New backends could be added from
|
|
under us. It needs to be initialized.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D220265
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/fdf5b0a81b0c0e87d31c5963091681a0e5960678
|
|
---
|
|
modules/desktop_capture/desktop_capturer.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/desktop_capture/desktop_capturer.h b/modules/desktop_capture/desktop_capturer.h
|
|
index 60c04723d6..fb3cc94f74 100644
|
|
--- a/modules/desktop_capture/desktop_capturer.h
|
|
+++ b/modules/desktop_capture/desktop_capturer.h
|
|
@@ -82,7 +82,7 @@ class RTC_EXPORT DesktopCapturer {
|
|
struct Source {
|
|
// The unique id to represent a Source of current DesktopCapturer.
|
|
SourceId id;
|
|
- pid_t pid;
|
|
+ pid_t pid = 0;
|
|
|
|
// Title of the window or screen in UTF-8 encoding, maybe empty. This field
|
|
// should not be used to identify a source.
|