Make mousey events targeted properly at textnodes (bug 185889, bug 103055), fix client-side image maps (bug 110072), r=saari@netscape.com, sr=bryner@netscape.com, a=dbaron@dbaron.org

content/events/src/nsEventStateManager.cpp

@@ -2502,20 +2502,9 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext* aPresContext, nsGUIE
   switch(aEvent->message) {
   case NS_MOUSE_MOVE:
     {
-      // Optimization if we're over the same frame as before
-      if (mCurrentTarget == mLastMouseOverFrame) {
-        break;
-      }
-
-      // Check whether we are over the same element as before
+      // Get the target content target (mousemove target == mouseover target)
       nsCOMPtr<nsIContent> targetElement;
-      nsIFrame* targetFrame;
-      if (mCurrentTarget) {
-        mCurrentTarget->GetContentForEvent(aPresContext, aEvent,
-                                           getter_AddRefs(targetElement));
-        targetFrame = mCurrentTarget;
-      }
-
+      GetEventTargetContent(aEvent, getter_AddRefs(targetElement));
       if (mLastMouseOverElement == targetElement) {
         break;
       }
@@ -2547,14 +2536,6 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext* aPresContext, nsGUIE
       // Before firing mouseover, check for recursion
       if (targetElement != mFirstMouseOverEventElement) {
       
-        // If we actually went and got a parent element, we need to fetch its
-        // frame so we can send it events
-        if (!targetFrame) {
-          nsCOMPtr<nsIPresShell> shell;
-          aPresContext->GetShell(getter_AddRefs(shell));
-          shell->GetPrimaryFrameFor(targetElement, &targetFrame);
-        }
-
         // Store the first mouseOver event we fire and don't refire mouseOver
         // to that element while the first mouseOver is still ongoing.
         mFirstMouseOverEventElement = targetElement;
@@ -2564,9 +2545,10 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext* aPresContext, nsGUIE
         }
 
         // Fire mouseover
+        nsIFrame* targetFrame = nsnull;
+        GetEventTarget(&targetFrame);
         DispatchMouseEvent(aPresContext, aEvent, NS_MOUSE_ENTER_SYNTH,
-                           targetElement, targetFrame,
-                           mLastMouseOverElement);
+                           targetElement, targetFrame, mLastMouseOverElement);
 
         mLastMouseOverFrame = targetFrame;
         mLastMouseOverElement = targetElement;
@@ -2826,11 +2808,8 @@ nsEventStateManager::CheckForAndDispatchClick(nsIPresContext* aPresContext,
 {
   nsresult ret = NS_OK;
   nsMouseEvent event;
-  nsCOMPtr<nsIContent> mouseContent;
   PRInt32 flags = NS_EVENT_FLAG_INIT;
 
-  mCurrentTarget->GetContentForEvent(aPresContext, aEvent, getter_AddRefs(mouseContent));
-
   //If mouse is still over same element, clickcount will be > 1.
   //If it has moved it will be zero, so no click.
   if (0 != aEvent->clickCount) {
@@ -2863,6 +2842,9 @@ nsEventStateManager::CheckForAndDispatchClick(nsIPresContext* aPresContext,
     nsCOMPtr<nsIPresShell> presShell;
     mPresContext->GetShell(getter_AddRefs(presShell));
     if (presShell) {
+      nsCOMPtr<nsIContent> mouseContent;
+      GetEventTargetContent(aEvent, getter_AddRefs(mouseContent));
+
       ret = presShell->HandleEventWithTarget(&event, mCurrentTarget, mouseContent, flags, aStatus);
       if (NS_SUCCEEDED(ret) && aEvent->clickCount == 2) {
         nsMouseEvent event2;
@@ -3742,25 +3724,10 @@ nsEventStateManager::GetEventTargetContent(nsEvent* aEvent, nsIContent** aConten
     return NS_OK;
   }
 
-  if (!mCurrentTarget) {
-    nsCOMPtr<nsIPresShell> presShell;
-    mPresContext->GetShell(getter_AddRefs(presShell));
-    if (presShell) {
-      presShell->GetEventTargetFrame(&mCurrentTarget);
-
-      //This may be new frame that hasn't been through the ESM so we
-      //must set its NS_FRAME_EXTERNAL_REFERENCE bit.
-      if (mCurrentTarget) {
-        nsFrameState state;
-        mCurrentTarget->GetFrameState(&state);
-        state |= NS_FRAME_EXTERNAL_REFERENCE;
-        mCurrentTarget->SetFrameState(state);
-      }
-    }
-  }
-
-  if (mCurrentTarget) {
-    mCurrentTarget->GetContentForEvent(mPresContext, aEvent, aContent);
+  nsCOMPtr<nsIPresShell> presShell;
+  mPresContext->GetShell(getter_AddRefs(presShell));
+  if (presShell) {
+    presShell->GetEventTargetContent(aEvent, aContent);
     return NS_OK;
   }
 

layout/base/nsIPresShell.h

@@ -477,6 +477,11 @@ public:
     */
   NS_IMETHOD GetEventTargetFrame(nsIFrame** aFrame) = 0;
 
+  /**
+    * Gets the current target event frame from the PresShell
+    */
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent) = 0;
+
   /**
    * Get and set the history state for the current document 
    */

layout/base/nsPresShell.cpp

@@ -1142,6 +1142,7 @@ public:
 
   NS_IMETHOD HandleEventWithTarget(nsEvent* aEvent, nsIFrame* aFrame, nsIContent* aContent, PRUint32 aFlags, nsEventStatus* aStatus);
   NS_IMETHOD GetEventTargetFrame(nsIFrame** aFrame);
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent);
 
   NS_IMETHOD IsReflowLocked(PRBool* aIsLocked);  
 #ifdef IBMBIDI
@@ -5799,6 +5800,23 @@ PresShell::GetEventTargetFrame(nsIFrame** aFrame)
 	return NS_OK;
 }
 
+NS_IMETHODIMP
+PresShell::GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent)
+{
+  if (mCurrentEventContent) {
+    *aContent = mCurrentEventContent;
+    NS_IF_ADDREF(*aContent);
+  } else {
+    nsIFrame* currentEventFrame = GetCurrentEventFrame();
+    if (currentEventFrame) {
+      currentEventFrame->GetContentForEvent(mPresContext, aEvent, aContent);
+    } else {
+      *aContent = nsnull;
+    }
+  }
+	return NS_OK;
+}
+
 void
 PresShell::PushCurrentEventInfo(nsIFrame* aFrame, nsIContent* aContent)
 {

layout/base/public/nsIPresShell.h

@@ -477,6 +477,11 @@ public:
     */
   NS_IMETHOD GetEventTargetFrame(nsIFrame** aFrame) = 0;
 
+  /**
+    * Gets the current target event frame from the PresShell
+    */
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent) = 0;
+
   /**
    * Get and set the history state for the current document 
    */

layout/html/base/src/nsPresShell.cpp

@@ -1142,6 +1142,7 @@ public:
 
   NS_IMETHOD HandleEventWithTarget(nsEvent* aEvent, nsIFrame* aFrame, nsIContent* aContent, PRUint32 aFlags, nsEventStatus* aStatus);
   NS_IMETHOD GetEventTargetFrame(nsIFrame** aFrame);
+  NS_IMETHOD GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent);
 
   NS_IMETHOD IsReflowLocked(PRBool* aIsLocked);  
 #ifdef IBMBIDI
@@ -5799,6 +5800,23 @@ PresShell::GetEventTargetFrame(nsIFrame** aFrame)
 	return NS_OK;
 }
 
+NS_IMETHODIMP
+PresShell::GetEventTargetContent(nsEvent* aEvent, nsIContent** aContent)
+{
+  if (mCurrentEventContent) {
+    *aContent = mCurrentEventContent;
+    NS_IF_ADDREF(*aContent);
+  } else {
+    nsIFrame* currentEventFrame = GetCurrentEventFrame();
+    if (currentEventFrame) {
+      currentEventFrame->GetContentForEvent(mPresContext, aEvent, aContent);
+    } else {
+      *aContent = nsnull;
+    }
+  }
+	return NS_OK;
+}
+
 void
 PresShell::PushCurrentEventInfo(nsIFrame* aFrame, nsIContent* aContent)
 {