From fd3a49ef81b701f549a2c1f292bbcdbb3ac43706 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 22:28:17 -0700 Subject: [PATCH] fix: event propagation after exiting fullscreen on Windows (#33788) * fix: event propagation after exiting fullscreen on Windows * ci: empty commit to trigger circleci Co-authored-by: Shelley Vohr Co-authored-by: VerteDinde --- shell/browser/api/electron_api_web_contents.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 714d0d60c6076..caf9cdb41b3ea 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -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_) { @@ -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(