undoing hackery and fixing a leak. r=dbaron

content/events/src/nsEventListenerManager.cpp

@@ -249,8 +249,6 @@ nsresult nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener
   nsListenerStruct* ls;
   nsresult rv;
   nsCOMPtr<nsIScriptEventListener> sel = do_QueryInterface(aListener, &rv);
-
-  aListener->QueryInterface(kIScriptEventListenerIID, (void**)&sel);
   
   for (int i=0; i<(*listeners)->Count(); i++) {
     ls = (nsListenerStruct*)(*listeners)->ElementAt(i);
@@ -264,7 +262,7 @@ nsresult nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener
       //method to verify equality.
       nsCOMPtr<nsIScriptEventListener> regSel = do_QueryInterface(ls->mListener, &rv);
       if (NS_SUCCEEDED(rv) && regSel) {
-		PRBool equal;
+		    PRBool equal;
         if (NS_SUCCEEDED(regSel->CheckIfEqual(sel, &equal)) && equal) {
           if (ls->mFlags & aFlags && ls->mSubType & aSubType) {
             found = PR_TRUE;

content/html/document/src/nsHTMLDocument.cpp

@@ -1938,7 +1938,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
 
     result = NS_OpenURI(getter_AddRefs(channel), aSourceURL, nsnull, group);
     if (NS_FAILED(result)) return result;
-/*
+
     //Before we reset the doc notify the globalwindow of the change.
     if (mScriptGlobalObject) {
       //Hold onto ourselves on the offchance that we're down to one ref
@@ -1946,7 +1946,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
       result = mScriptGlobalObject->SetNewDocument(kungFuDeathGrip);
       if (NS_FAILED(result)) return result;
     }
-*/
+
     result = Reset(channel, group);
     if (NS_FAILED(result)) return result;
     if (NS_OK == result) {

layout/events/src/nsEventListenerManager.cpp

@@ -249,8 +249,6 @@ nsresult nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener
   nsListenerStruct* ls;
   nsresult rv;
   nsCOMPtr<nsIScriptEventListener> sel = do_QueryInterface(aListener, &rv);
-
-  aListener->QueryInterface(kIScriptEventListenerIID, (void**)&sel);
   
   for (int i=0; i<(*listeners)->Count(); i++) {
     ls = (nsListenerStruct*)(*listeners)->ElementAt(i);
@@ -264,7 +262,7 @@ nsresult nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener
       //method to verify equality.
       nsCOMPtr<nsIScriptEventListener> regSel = do_QueryInterface(ls->mListener, &rv);
       if (NS_SUCCEEDED(rv) && regSel) {
-		PRBool equal;
+		    PRBool equal;
         if (NS_SUCCEEDED(regSel->CheckIfEqual(sel, &equal)) && equal) {
           if (ls->mFlags & aFlags && ls->mSubType & aSubType) {
             found = PR_TRUE;

layout/html/document/src/nsHTMLDocument.cpp

@@ -1938,7 +1938,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
 
     result = NS_OpenURI(getter_AddRefs(channel), aSourceURL, nsnull, group);
     if (NS_FAILED(result)) return result;
-/*
+
     //Before we reset the doc notify the globalwindow of the change.
     if (mScriptGlobalObject) {
       //Hold onto ourselves on the offchance that we're down to one ref
@@ -1946,7 +1946,7 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL)
       result = mScriptGlobalObject->SetNewDocument(kungFuDeathGrip);
       if (NS_FAILED(result)) return result;
     }
-*/
+
     result = Reset(channel, group);
     if (NS_FAILED(result)) return result;
     if (NS_OK == result) {