From f50df1d5529a4e31f9a8dfc02531c703ce7d1625 Mon Sep 17 00:00:00 2001
From: "jkeiser%netscape.com"
 <jkeiser%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Feb 2003 22:59:08 +0000
Subject: [PATCH] Make click+hold right-click menu work again on Mac (bug
 193799), r=bryner/saari, sr=jst

git-svn-id: svn://10.0.0.236/trunk@138637 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/events/src/nsEventStateManager.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index 7a3821f9c07..f6d7ee8368c 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -3726,14 +3726,20 @@ nsEventStateManager::GetEventTargetContent(nsEvent* aEvent, nsIContent** aConten
     return NS_OK;
   }
 
+  *aContent = nsnull;
+
   nsCOMPtr<nsIPresShell> presShell;
   mPresContext->GetShell(getter_AddRefs(presShell));
   if (presShell) {
     presShell->GetEventTargetContent(aEvent, aContent);
-    return NS_OK;
   }
 
-  *aContent = nsnull;
+  // Some events here may set mCurrentTarget but not set the corresponding
+  // event target in the PresShell.
+  if (!*aContent && mCurrentTarget) {
+    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, aContent);
+  }
+
   return NS_OK;
 }