From b5ff53d869ad34bf81fd66a251981c497fb6ff22 Mon Sep 17 00:00:00 2001
From: "Olli.Pettay%helsinki.fi" <Olli.Pettay%helsinki.fi>
Date: Thu, 11 May 2006 18:21:40 +0000
Subject: [PATCH] Didn't mean to check in this patch

---
 content/events/src/nsEventStateManager.cpp | 39 ++++------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 6b17b03e9ce0..3f366b375de8 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2543,29 +2543,6 @@ nsEventStateManager::AfterDispatchEvent()
   }
 }
 
-class nsESMEventCB : public nsDispatchingCallback
-{
-public:
-  nsESMEventCB(nsIContent* aTarget) : mTarget(aTarget) {}
-
-  virtual void HandleEvent(nsEventChainPostVisitor& aVisitor)
-  {
-    if (aVisitor.mPresContext) {
-      nsIPresShell* shell = aVisitor.mPresContext->GetPresShell();
-      if (shell) {
-        nsIFrame* frame = shell->GetPrimaryFrameFor(mTarget);
-        if (frame) {
-          frame->HandleEvent(aVisitor.mPresContext,
-                             (nsGUIEvent*) aVisitor.mEvent,
-                             &aVisitor.mEventStatus);
-        }
-      }
-    }
-  }
-
-  nsCOMPtr<nsIContent> mTarget;
-};
-
 nsIFrame*
 nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
                                         nsIContent* aTargetContent,
@@ -2587,22 +2564,18 @@ nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
   BeforeDispatchEvent();
   nsIFrame* targetFrame = nsnull;
   if (aTargetContent) {
-    nsESMEventCB callback(aTargetContent);
     nsEventDispatcher::Dispatch(aTargetContent, mPresContext, &event, nsnull,
-                                &status, &callback);
+                                &status);
 
-    nsIPresShell *shell = mPresContext ? mPresContext->GetPresShell() : nsnull;
+    nsIPresShell *shell = mPresContext->GetPresShell();
     if (shell) {
-      // Although the primary frame was checked in event callback, 
-      // it may not be the same object after event dispatching and handling.
-      // So we need to refetch it.
       targetFrame = shell->GetPrimaryFrameFor(aTargetContent);
-      if (targetFrame) {
-        SetFrameExternalReference(targetFrame);
-      }
     }
   }
-
+  if (targetFrame) {
+    targetFrame->HandleEvent(mPresContext, &event, &status);
+    SetFrameExternalReference(targetFrame);
+  }
   AfterDispatchEvent();
 
   mCurrentTargetContent = nsnull;