UI/AppKit: Request closure instead of always force closing tabs

Author: Lubrsi

UI/AppKit/Application/ApplicationDelegate.mm

@@ -197,7 +197,7 @@ - (void)initializeTabController:(TabController*)controller
 - (void)closeCurrentTab:(id)sender
 {
     auto* current_window = [NSApp keyWindow];
-    [current_window close];
+    [current_window performClose:self];
 }
 
 - (void)clearHistory:(id)sender

UI/AppKit/Interface/LadybirdWebView.h

@@ -63,4 +63,6 @@
 - (void)findInPageNextMatch;
 - (void)findInPagePreviousMatch;
 
+- (void)requestClose;
+
 @end

UI/AppKit/Interface/LadybirdWebView.mm

@@ -204,6 +204,11 @@ - (void)findInPagePreviousMatch
     m_web_view_bridge->find_in_page_previous_match();
 }
 
+- (void)requestClose
+{
+    m_web_view_bridge->request_close();
+}
+
 #pragma mark - Private methods
 
 - (void)updateViewportRect

UI/AppKit/Interface/TabController.mm

@@ -55,6 +55,8 @@ @interface TabController () <NSToolbarDelegate, NSSearchFieldDelegate, Autocompl
     OwnPtr<WebView::Autocomplete> m_autocomplete;
 }
 
+@property (nonatomic, assign) BOOL already_requested_close;
+
 @property (nonatomic, strong) Tab* parent;
 
 @property (nonatomic, strong) NSToolbar* toolbar;
@@ -397,6 +399,21 @@ - (void)windowDidBecomeMain:(NSNotification*)notification
     [delegate setActiveTab:[self tab]];
 }
 
+- (BOOL)windowShouldClose:(NSWindow*)sender
+{
+    // Prevent closing on first request so WebContent can cleanly shutdown (e.g. asking if the user is sure they want
+    // to leave, closing WebSocket connections, etc.)
+    if (!self.already_requested_close) {
+        self.already_requested_close = true;
+        [[[self tab] web_view] requestClose];
+        return false;
+    }
+
+    // If the user has already requested a close, then respect the user's request and just close the tab.
+    // For example, the WebContent process may not be responding.
+    return true;
+}
+
 - (void)windowWillClose:(NSNotification*)notification
 {
     auto* delegate = (ApplicationDelegate*)[NSApp delegate];