fix: setContentProtection(true) after hide on Windows
#45868
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
codebytere
commented
Mar 3, 2025
| DWORD affinity = enable ? WDA_EXCLUDEFROMCAPTURE : WDA_NONE; | ||
| ::SetWindowDisplayAffinity(hwnd, affinity); | ||
| if (!layered_) { | ||
| // Workaround to prevent black window on screen capture after hiding and |
There was a problem hiding this comment.
Tested to ensure no black window regression!
9dcbe9a to
838ba0e
Compare
838ba0e to
5a7e873
Compare
jkleinsc
approved these changes
Mar 4, 2025
|
Release Notes Persisted
|
This was referenced Mar 4, 2025
|
I have automatically backported this PR to "35-x-y", please check out #45889 |
|
I have automatically backported this PR to "34-x-y", please check out #45890 |
| ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style); | ||
| layered_ = true; | ||
| } | ||
| widget()->native_widget_private()->SetAllowScreenshots(!enable); |
There was a problem hiding this comment.
Great to see this issue being fixed! One question though, won't this change behavior since Chromium uses WDA_MONITOR instead of WDA_EXCLUDEFROMCAPTURE? here: https://source.chromium.org/chromium/chromium/src/+/main:ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc;l=1476?q=SetAllowScreenshots&ss=chromium%2Fchromium%2Fsrc&start=21
3 tasks
3 tasks
Closed
3 tasks
codebytere
added a commit
that referenced
this pull request
May 8, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue.
4 tasks
ckerr
pushed a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue.
trop bot
added a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
trop bot
added a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
trop bot
added a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
jkleinsc
pushed a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
8000
jkleinsc
pushed a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
ckerr
pushed a commit
that referenced
this pull request
May 9, 2025
Fixes #45990 We previously made a change in #45868 to fix content protection being lost on hide and re-show. However, this cause a breaking change where protected windows were made opaque black instead of being hidden as before. This overrides relevant methods in ElectronDesktopWindowTreeHostWin to restore the previous behavior. without regressing the original issue. Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Fixes #45844.
Refs CL:5789117
This PR fixes an issue where
setContentProtection(true)was reverted when a given window was hidden. This happened as a result of the above CL, which added logic to avoid setting content protection when a window was hidden. That wouldn't be an issue, except that we weren't using the upstreamWidgetfunctionality, and so when it went to ensure protection state after re-showing it, the status was incorrect. Fix this by leveraging upstream functionality. This PR additionally adds testing and a currently private getter function for content protection status so we can test and prevent regressions in the future. I'll look to expose that in a follow-up PR.Checklist
npm testpassesRelease Notes
Notes: Fixed an issue where
setContentProtection(true)was reverted when a given window was hidden.