Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: re-enable WindowCaptureMacV2 #37014

Closed
wants to merge 2 commits into from
Closed

Conversation

codebytere
Copy link
Member

Description of Change

Refs #30507.

Per upstream CRBUG:1179098, issues have been fixed and is no longer reproducible when testing with https://gist.github.com/925744c7c67347d67c5b29e91c31e37e .

Checklist

Release Notes

Notes: none

@codebytere codebytere added semver/patch backwards-compatible bug fixes target/23-x-y PR should also be added to the "23-x-y" branch. labels Jan 25, 2023
@codebytere codebytere requested a review from a team as a code owner January 25, 2023 08:56
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jan 25, 2023
@deepak1556
Copy link
Member

Test failures are related.

@codebytere codebytere marked this pull request as draft January 25, 2023 13:53
Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any tests that need to be re-enabled?

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jan 26, 2023
// TODO(deepak1556): Match upstream for `kWindowCaptureMacV2`
#if 0
if (remote_cocoa::ScopedCGWindowID::Get(desktop_media_id.id)) {
desktop_media_id.window_id = desktop_media_id.id;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deepak1556 we could do this, but then it would be invalid when for example passed into getUserMedia. I made this change for the same reason i did this one: https://github.com/electron/electron/pull/37014/files#diff-73f755a575b1c517f40cd8358386c43c4ffb0eff9e8a7a9ab80c5f50a248dcf4R156

@jkleinsc jkleinsc added the target/24-x-y PR should also be added to the "24-x-y" branch. label Feb 9, 2023
@jkleinsc jkleinsc added the target/25-x-y PR should also be added to the "25-x-y" branch. label Apr 6, 2023
@github-actions github-actions bot added the target/26-x-y PR should also be added to the "26-x-y" branch. label May 31, 2023
@codebytere codebytere force-pushed the re-enable-WindowCaptureMacV2 branch from d9d2a22 to 4c6abd3 Compare June 5, 2023 11:29
@github-actions github-actions bot added the target/27-x-y PR should also be added to the "27-x-y" branch. label Aug 16, 2023
@miniak miniak removed target/23-x-y PR should also be added to the "23-x-y" branch. target/24-x-y PR should also be added to the "24-x-y" branch. labels Oct 9, 2023
@github-actions github-actions bot added the target/28-x-y PR should also be added to the "28-x-y" branch. label Oct 11, 2023
@codebytere codebytere closed this Nov 28, 2023
@codebytere codebytere deleted the re-enable-WindowCaptureMacV2 branch November 28, 2023 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver/patch backwards-compatible bug fixes target/25-x-y PR should also be added to the "25-x-y" branch. target/26-x-y PR should also be added to the "26-x-y" branch. target/27-x-y PR should also be added to the "27-x-y" branch. target/28-x-y PR should also be added to the "28-x-y" branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants