github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-26 03:01:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash after win.showAllTabs() new tab (#49917)

Browse Source 
fix: crash after win.showAllTabs new tab
This commit is contained in:
Shelley Vohr
2026-02-24 22:09:09 +01:00
committed by GitHub
parent 818b28410f
commit 0aaea4eaa0
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
shell/browser/ui/cocoa/electron_ns_window.mm
View File

@@ -35,6 +35,41 @@ int ScopedDisableResize::disable_resize_ = 0;
typedef void (*MouseDownImpl)(id, SEL, NSEvent*);
// Work around an Apple bug where the visual tab picker's
// grid animation creates NSLayoutConstraints against nil layout anchors,
// crashing in NSVisualTabPickerShadowTileView. This happens when a new tabbed
// window is created while the tab picker is open — the "+" tile (and possibly
// others) have broken internal state. Rather than patching individual tile
// animation methods, short-circuit the entire grid animation by swizzling
// NSVisualTabPickerGridView's -startGridAnimation:completionHandler: to
// immediately invoke the completion handler without running the animation.
typedef void (*StartGridAnimationIMP)(id, SEL, id, id);
static StartGridAnimationIMP g_orig_startGridAnimation = nullptr;
static void Patched_startGridAnimation(id self,
SEL _cmd,
id animation,
void (^completionHandler)(void)) {
if (completionHandler)
completionHandler();
}
static void SwizzleTabPickerGridAnimation() {
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
Class cls = NSClassFromString(@"NSVisualTabPickerGridView");
if (!cls)
return;
SEL sel = @selector(startGridAnimation:completionHandler:);
Method method = class_getInstanceMethod(cls, sel);
if (!method)
return;
g_orig_startGridAnimation =
(StartGridAnimationIMP)method_getImplementation(method);
method_setImplementation(method, (IMP)Patched_startGridAnimation);
});
}
namespace {
MouseDownImpl g_nsthemeframe_mousedown;
MouseDownImpl g_nsnextstepframe_mousedown;
@@ -125,6 +160,7 @@ void SwizzleSwipeWithEvent(NSView* view, SEL swiz_selector) {
- (id)initWithShell:(electron::NativeWindowMac*)shell
styleMask:(NSUInteger)styleMask {
SwizzleTabPickerGridAnimation();
if ((self = [super initWithContentRect:ui::kWindowSizeDeterminedLater
styleMask:styleMask
backing:NSBackingStoreBuffered