Bug 1700245 - Split PresShell::ClearMouseCapture into two functions, one takes `nsIFrame`, the other takes no argument. r=tnikkel

Depends on D119067

Differential Revision: https://phabricator.services.mozilla.com/D119068

layout/base/PresShell.cpp

@@ -3777,16 +3777,22 @@ void PresShell::ClearMouseCaptureOnView(nsView* aView) {
   AllowMouseCapture(false);
 }
 
-void PresShell::ClearMouseCapture(nsIFrame* aFrame) {
+void PresShell::ClearMouseCapture() {
   nsIContent* capturingContent = GetCapturingContent();
   if (!capturingContent) {
     AllowMouseCapture(false);
     return;
   }
 
-  // null frame argument means clear the capture
-  if (!aFrame) {
-    ReleaseCapturingContent();
+  ReleaseCapturingContent();
+  AllowMouseCapture(false);
+}
+
+void PresShell::ClearMouseCapture(nsIFrame* aFrame) {
+  MOZ_ASSERT(aFrame);
+
+  nsIContent* capturingContent = GetCapturingContent();
+  if (!capturingContent) {
     AllowMouseCapture(false);
     return;
   }
@@ -7772,7 +7778,7 @@ PresShell::EventHandler::ComputeRootFrameToHandleEventWithCapturingContent(
   // If the BrowsingContext is active, look for a scrolling container.
   BrowsingContext* bc = GetPresContext()->Document()->GetBrowsingContext();
   if (!bc || !bc->IsActive()) {
-    ClearMouseCapture(nullptr);
+    ClearMouseCapture();
     *aIsCapturingContentIgnored = true;
     return aRootFrameToHandleEvent;
   }
@@ -9804,7 +9810,7 @@ bool PresShell::ProcessReflowCommands(bool aInterruptible) {
 void PresShell::WindowSizeMoveDone() {
   if (mPresContext) {
     EventStateManager::ClearGlobalActiveContent(nullptr);
-    ClearMouseCapture(nullptr);
+    ClearMouseCapture();
   }
 }
 

layout/base/PresShell.h

@@ -204,6 +204,9 @@ class PresShell final : public nsStubDocumentObserver,
   // clears that capture.
   static void ClearMouseCapture(nsIFrame* aFrame);
 
+  // Clear the capture content if it exists in this process.
+  static void ClearMouseCapture();
+
 #ifdef ACCESSIBILITY
   /**
    * Return the document accessible for this PresShell if there is one.

widget/nsBaseDragService.cpp

@@ -264,7 +264,7 @@ nsBaseDragService::InvokeDragSession(
   // capture. However, this gets in the way of determining drag
   // feedback for things like trees because the event coordinates
   // are in the wrong coord system, so turn off mouse capture.
-  PresShell::ClearMouseCapture(nullptr);
+  PresShell::ClearMouseCapture();
 
   if (mSessionIsSynthesizedForTests) {
     mDoingDrag = true;