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.

Sign up for GitHub

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

Jump to bottom

fix: event propagation after exiting fullscreen on Windows #33788

Merged
merged 2 commits into from Apr 15, 2022
Merged

fix: event propagation after exiting fullscreen on Windows #33788

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b295937
fix: event propagation after exiting fullscreen on Windows
codebytere Apr 13, 2022
144263d
ci: empty commit to trigger circleci
VerteDinde Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions shell/browser/api/electron_api_web_contents.cc
View file
Open in desktop
Expand Up @@ -1342,6 +1342,11 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
if (!owner_window_)
return;

// This needs to be called before we exit fullscreen on the native window,
// or the controller will incorrectly think we weren't fullscreen and bail.
exclusive_access_manager_->fullscreen_controller()->ExitFullscreenModeForTab(
source);

SetHtmlApiFullscreen(false);

if (native_fullscreen_) {
Expand All @@ -1350,9 +1355,6 @@ void WebContents::ExitFullscreenModeForTab(content::WebContents* source) {
// `chrome/browser/ui/exclusive_access/fullscreen_controller.cc`.
source->GetRenderViewHost()->GetWidget()->SynchronizeVisualProperties();
}

exclusive_access_manager_->fullscreen_controller()->ExitFullscreenModeForTab(
source);
}

void WebContents::RendererUnresponsive(
Expand Down