github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-10 16:08:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: html fullscreen transitions stacking (#32905)

Browse Source 
* fix: html fullscreen transitions stacking

* spec: move webview test to spec-main
This commit is contained in:
Shelley Vohr
2022-06-07 18:59:50 +02:00
committed by GitHub
parent f44ecb7f03
commit 16db5a112e
12 changed files with 184 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
shell/browser/native_window_mac.h
View File

@@ -8,7 +8,6 @@
#import <Cocoa/Cocoa.h>
#include <memory>
#include <queue>
#include <string>
#include <vector>
@@ -172,11 +171,6 @@ class NativeWindowMac : public NativeWindow,
void SetCollectionBehavior(bool on, NSUInteger flag);
void SetWindowLevel(int level);
enum class FullScreenTransitionState { ENTERING, EXITING, NONE };
// Handle fullscreen transitions.
void SetFullScreenTransitionState(FullScreenTransitionState state);
void HandlePendingFullscreenTransitions();
bool HandleDeferredClose();
void SetHasDeferredWindowClose(bool defer_close) {
has_deferred_window_close_ = defer_close;
@@ -247,13 +241,6 @@ class NativeWindowMac : public NativeWindow,
bool zoom_to_page_width_ = false;
absl::optional<gfx::Point> traffic_light_position_;
std::queue<bool> pending_transitions_;
FullScreenTransitionState fullscreen_transition_state() const {
return fullscreen_transition_state_;
}
FullScreenTransitionState fullscreen_transition_state_ =
FullScreenTransitionState::NONE;
// Trying to close an NSWindow during a fullscreen transition will cause the
// window to lock up. Use this to track if CloseWindow was called during a
// fullscreen transition, to defer the -[NSWindow close] call until the