Commit graph

14 commits

Author SHA1 Message Date
Andrew MacDonald
6bfb122cd1 Add a display_id parameter to the desktopCapturer API. (#12417)
* Add a screen_api_id parameter to the desktopCapturer API.

When using the DirectX capturer on Windows, there was previously no way
to associate desktopCapturer/getUserMedia and electron.screen API
screens. This new parameter provides the association.

* Fix non-Windows build.

* Fix Mac.

* Fix Mac harder.

* JS lint

* clang-format C++ code.

* IWYU

* display_id, Linux comment, better test

* lint

* Fix tests on Linux.

* Add display_id documentation.
2018-04-09 14:43:35 +09:00
Aleksei Kuzmin
cf749a8e18 Explicitly skip tests that should be skipped 2017-11-20 14:43:23 +01:00
Shelley Vohr
6feff1d6e8
update desktop capturer spec 2017-10-26 20:44:06 -04:00
Kevin Sawicki
ce0165367c Add spec for invalid capture options 2016-08-09 15:31:24 -07:00
Cheng Zhao
f65f8918c9 Fix specs on Windows when running without desktop session 2016-04-30 21:03:22 +09:00
deepak1556
d64e3784f4 renderer: fix desktop capture api not responding different subsequest calls 2016-04-28 14:24:22 +05:30
Zeke Sikelianos
f35f362272 autoformat more files 2016-03-30 17:00:31 -07:00
Kevin Sawicki
669b815758 Add missing semicolons 2016-01-21 09:32:22 -07:00
Kevin Sawicki
b014eea8d3 Tweak spec description 2016-01-19 11:05:57 -08:00
Kevin Sawicki
517dce443b Remove unused errorMessage reference 2016-01-19 11:02:12 -08:00
Kevin Sawicki
c719b252cb Add failing spec 2016-01-19 10:57:18 -08:00
Kevin Sawicki
fb3ab9e1f1 Use const and remove extra returns 2016-01-19 10:54:12 -08:00
Kevin Sawicki
572f53dc5e Expand spec description 2016-01-14 17:20:44 -08:00
Kevin Sawicki
047975609d Add missing -spec suffix to desktop capturer spec 2016-01-14 17:03:51 -08:00
Renamed from spec/api-desktop-capturer.js (Browse further)