b896dbb103
Because we used decrementing negative source ids for fake video id when instantating a native macOS screen share picker, we eventually hit the `DesktopMediaID::kFakeId = -3` in Chromium source code which displayed a test green screen. In this change we reserve our own fake id of `-4` and decrement the window id integer for uniqueness instead. Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Fedor Indutny <238531+indutny@users.noreply.github.com>
43 lines
1.5 KiB
TypeScript
43 lines
1.5 KiB
TypeScript
import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
|
|
import { net } from 'electron/main';
|
|
const { fromPartition, fromPath, Session } = process._linkedBinding('electron_browser_session');
|
|
const { isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
|
|
|
|
// Fake video window that activates the native system picker
|
|
// This is used to get around the need for a screen/window
|
|
// id in Chrome's desktopCapturer.
|
|
let fakeVideoWindowId = -1;
|
|
// See content/public/browser/desktop_media_id.h
|
|
const kMacOsNativePickerId = -4;
|
|
const systemPickerVideoSource = Object.create(null);
|
|
Object.defineProperty(systemPickerVideoSource, 'id', {
|
|
get () {
|
|
return `window:${kMacOsNativePickerId}:${fakeVideoWindowId--}`;
|
|
}
|
|
});
|
|
systemPickerVideoSource.name = '';
|
|
Object.freeze(systemPickerVideoSource);
|
|
|
|
Session.prototype.fetch = function (input: RequestInfo, init?: RequestInit) {
|
|
return fetchWithSession(input, init, this, net.request);
|
|
};
|
|
|
|
Session.prototype.setDisplayMediaRequestHandler = function (handler, opts) {
|
|
if (!handler) return this._setDisplayMediaRequestHandler(handler, opts);
|
|
|
|
this._setDisplayMediaRequestHandler(async (req, callback) => {
|
|
if (opts && opts.useSystemPicker && isDisplayMediaSystemPickerAvailable()) {
|
|
return callback({ video: systemPickerVideoSource });
|
|
}
|
|
|
|
return handler(req, callback);
|
|
}, opts);
|
|
};
|
|
|
|
export default {
|
|
fromPartition,
|
|
fromPath,
|
|
get defaultSession () {
|
|
return fromPartition('');
|
|
}
|
|
};
|