From a92698e34146b48e01e9815595a4c7cc44c17c24 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Fri, 25 Aug 2006 18:37:54 +0000
Subject: [PATCH] Back out part of the patch for bug 329509 that accidentally
 landed with bug 348062. Fixes build bustage.

---
 content/base/src/nsGenericDOMDataNode.cpp |  6 ++----
 content/base/src/nsGenericElement.cpp     | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp
index 57980f07baf..3a716a17b7d 100644
--- a/content/base/src/nsGenericDOMDataNode.cpp
+++ b/content/base/src/nsGenericDOMDataNode.cpp
@@ -428,8 +428,7 @@ nsGenericDOMDataNode::AppendData(const nsAString& aData)
     mutation.mPrevAttrValue = oldValue;
     mutation.mNewAttrValue = GetCurrentValueAtom();
 
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation, nsnull, nsnull, nsnull,
-                                PR_FALSE, PR_FALSE);
+    nsEventDispatcher::Dispatch(this, nsnull, &mutation);
   }
 
   // Notify observers
@@ -1001,8 +1000,7 @@ nsGenericDOMDataNode::SetText(const PRUnichar* aBuffer,
         do_GetAtom(Substring(aBuffer, aBuffer + aLength));
     }
 
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation, nsnull, nsnull, nsnull,
-                                PR_FALSE, PR_FALSE);
+    nsEventDispatcher::Dispatch(this, nsnull, &mutation);
   }
 
   // Trigger a reflow
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index a857d995e17..3f4c66b3cc9 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2422,8 +2422,7 @@ nsGenericElement::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
           NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
       nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEINSERTED);
       mutation.mRelatedNode = do_QueryInterface(container);
-      nsEventDispatcher::Dispatch(aKid, nsnull, &mutation, nsnull, nsnull,
-                                  nsnull, PR_FALSE, PR_FALSE);
+      nsEventDispatcher::Dispatch(aKid, nsnull, &mutation);
     }
   }
 
@@ -2472,8 +2471,7 @@ nsGenericElement::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify,
         NS_EVENT_BITS_MUTATION_NODEREMOVED)) {
     nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEREMOVED);
     mutation.mRelatedNode = do_QueryInterface(container);
-    nsEventDispatcher::Dispatch(aKid, nsnull, &mutation, nsnull, nsnull,
-                                nsnull, PR_FALSE, PR_FALSE);
+    nsEventDispatcher::Dispatch(aKid, nsnull, &mutation, nsnull, nsnull);
   }
 
   // Someone may have removed the kid or any of its siblings while that event
@@ -3413,8 +3411,7 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
       mutation.mPrevAttrValue = do_GetAtom(aOldValue);
     }
     mutation.mAttrChange = modType;
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation, nsnull, nsnull,
-                                nsnull, PR_FALSE, PR_FALSE);
+    nsEventDispatcher::Dispatch(this, nsnull, &mutation;
   }
 
   if (aNotify) {
@@ -3614,8 +3611,7 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
       mutation.mPrevAttrValue = do_GetAtom(value);
     mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL;
 
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation, nsnull, nsnull, nsnull,
-                                PR_FALSE, PR_FALSE);
+    nsEventDispatcher::Dispatch(this, nsnull, &mutation);
   }
 
   // Clear binding to nsIDOMNamedNodeMap