From 0cd6f26b6b8fcec2b43398fd831f6b9e0cb977e3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 Apr 2024 17:18:09 +0200
Subject: Merging upstream version 115.9.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 widget/cocoa/MOZMenuOpeningCoordinator.mm | 3 +++
 widget/nsBaseDragService.cpp              | 1 +
 2 files changed, 4 insertions(+)

(limited to 'widget')

diff --git a/widget/cocoa/MOZMenuOpeningCoordinator.mm b/widget/cocoa/MOZMenuOpeningCoordinator.mm
index 3ac4d8385f..bc78b3778c 100644
--- a/widget/cocoa/MOZMenuOpeningCoordinator.mm
+++ b/widget/cocoa/MOZMenuOpeningCoordinator.mm
@@ -122,6 +122,9 @@ static BOOL sNeedToUnwindForMenuClosing = NO;
 
 - (void)cancelAsynchronousOpening:(NSInteger)aHandle {
   if (mPendingOpening && mPendingOpening.handle == aHandle) {
+    [NSObject cancelPreviousPerformRequestsWithTarget:self
+                                             selector:@selector(_runMenu)
+                                               object:nil];
     [mPendingOpening release];
     mPendingOpening = nil;
   }
diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
index bdd8d2bd28..212038e0e4 100644
--- a/widget/nsBaseDragService.cpp
+++ b/widget/nsBaseDragService.cpp
@@ -632,6 +632,7 @@ nsBaseDragService::EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) {
   mSourceDocument = nullptr;
   mSourceNode = nullptr;
   mSourceWindowContext = nullptr;
+  mSourceTopWindowContext = nullptr;
   mTriggeringPrincipal = nullptr;
   mCsp = nullptr;
   mSelection = nullptr;
-- 
cgit v1.2.3