27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 28 Oct 2021 18:13:00 +0000
|
|
Subject: Bug 1729367 - P6 - Restore PID recording post cherry-pick;r=mjf
|
|
|
|
This restores the code from P0, which was removed to make cherry-picking 439ffe462a66ad9fa9a251b265e4ab28c2647d25 and 449a78b1e20ea85b11f967cf3a184ee610ce21c3 easier.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D129714
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/72a83cb2e571023cd4150bbdef5be5455ce851f4
|
|
---
|
|
modules/desktop_capture/win/window_capture_utils.cc | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/modules/desktop_capture/win/window_capture_utils.cc b/modules/desktop_capture/win/window_capture_utils.cc
|
|
index 261c4002ae..040ee7da1c 100644
|
|
--- a/modules/desktop_capture/win/window_capture_utils.cc
|
|
+++ b/modules/desktop_capture/win/window_capture_utils.cc
|
|
@@ -79,6 +79,10 @@ BOOL CALLBACK GetWindowListHandler(HWND hwnd, LPARAM param) {
|
|
DesktopCapturer::Source window;
|
|
window.id = reinterpret_cast<WindowId>(hwnd);
|
|
|
|
+ DWORD pid;
|
|
+ GetWindowThreadProcessId(hwnd, &pid);
|
|
+ window.pid = static_cast<pid_t>(pid);
|
|
+
|
|
// GetWindowText* are potentially blocking operations if `hwnd` is
|
|
// owned by the current process. The APIs will send messages to the window's
|
|
// message loop, and if the message loop is waiting on this operation we will
|