diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:18:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:18:54 +0000 |
| commit | a5f28e22cc28ca53d092f6545bc924ee43a8bbe4 (patch) | |
| tree | 7e02d01734d97de08bdeed66d2d5185f8e4f0a61 /widget | |
| parent | Releasing progress-linux version 115.8.0esr-1~deb12u1progress7u1. (diff) | |
| download | firefox-esr-a5f28e22cc28ca53d092f6545bc924ee43a8bbe4.tar.xz firefox-esr-a5f28e22cc28ca53d092f6545bc924ee43a8bbe4.zip | |
Merging upstream version 115.9.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/cocoa/MOZMenuOpeningCoordinator.mm | 3 | ||||
| -rw-r--r-- | widget/nsBaseDragService.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
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; |