06e90addc7
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.2 KiB
Diff
28 lines
1.2 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 28 Oct 2021 18:13:00 +0000
|
|
Subject: Bug 1729367 - P7 - restore mac PID tracking using new API;r=mjf
|
|
a=webrtc-update
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D129721
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/1495ca5ef535f8ad692a3a579ca42eddc14f39a8
|
|
---
|
|
modules/desktop_capture/window_capturer_mac.mm | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm
|
|
index 7454e54c3a..561c3d469d 100644
|
|
--- a/modules/desktop_capture/window_capturer_mac.mm
|
|
+++ b/modules/desktop_capture/window_capturer_mac.mm
|
|
@@ -167,9 +167,10 @@ void WindowCapturerMac::CaptureFrame() {
|
|
return webrtc::GetWindowList(
|
|
[sources](CFDictionaryRef window) {
|
|
WindowId window_id = GetWindowId(window);
|
|
+ int pid = GetWindowOwnerPid(window);
|
|
if (window_id != kNullWindowId) {
|
|
sources->push_back(DesktopCapturer::Source{
|
|
- window_id, GetWindowTitle(window)});
|
|
+ window_id, pid, GetWindowTitle(window)});
|
|
}
|
|
return true;
|
|
},
|