Bug 654770, fix few AddEventListener calls now that it has 2 optional parameters, r=sicking
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Thu, 05 May 2011 23:33:13 +0300
changeset 69031 8ccb9dff65d7032821c8ccc74ba744d1354ae251
parent 69030 eaaa24ff93a01a285fda5bcfbef01c6cad99e69b
child 69032 b489fd99b3337f61aed46856aafb71fefe502095
push id19834
push useropettay@mozilla.com
push dateThu, 05 May 2011 21:28:49 +0000
treeherdermozilla-central@8ccb9dff65d7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs654770
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 654770, fix few AddEventListener calls now that it has 2 optional parameters, r=sicking
accessible/src/base/nsRootAccessible.cpp
content/base/src/nsGenericElement.cpp
content/base/src/nsInProcessTabChildGlobal.h
dom/ipc/TabChild.h
--- a/accessible/src/base/nsRootAccessible.cpp
+++ b/accessible/src/base/nsRootAccessible.cpp
@@ -259,17 +259,17 @@ nsresult nsRootAccessible::AddEventListe
   // non chrome document fire untrusted events.
   nsCOMPtr<nsIDOMNSEventTarget> nstarget(do_QueryInterface(mDocument));
 
   if (nstarget) {
     for (const char* const* e = docEvents,
                    * const* e_end = docEvents + NS_ARRAY_LENGTH(docEvents);
          e < e_end; ++e) {
       nsresult rv = nstarget->AddEventListener(NS_ConvertASCIItoUTF16(*e),
-                                               this, PR_TRUE, PR_TRUE, 1);
+                                               this, PR_TRUE, PR_TRUE, 2);
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
 
   if (!mCaretAccessible) {
     mCaretAccessible = new nsCaretAccessible(this);
   }
 
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2011,17 +2011,17 @@ nsDOMEventRTTearoff::SetScriptTypeID(PRU
 
 
 // nsIDOMEventTarget
 NS_IMETHODIMP
 nsDOMEventRTTearoff::AddEventListener(const nsAString& aType,
                                       nsIDOMEventListener *aListener,
                                       PRBool useCapture)
 {
-  return AddEventListener(aType, aListener, useCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, useCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
 nsDOMEventRTTearoff::RemoveEventListener(const nsAString& aType,
                                          nsIDOMEventListener* aListener,
                                          PRBool aUseCapture)
 {
   return RemoveGroupedEventListener(aType, aListener, aUseCapture, nsnull);
--- a/content/base/src/nsInProcessTabChildGlobal.h
+++ b/content/base/src/nsInProcessTabChildGlobal.h
@@ -82,17 +82,17 @@ public:
 
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture)
   {
     // By default add listeners only for trusted events!
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
-                                                    aUseCapture, PR_FALSE, 1);
+                                                    aUseCapture, PR_FALSE, 2);
   }
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture, PRBool aWantsUntrusted,
                               PRUint8 optional_argc)
   {
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
                                                     aUseCapture,
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -112,17 +112,17 @@ public:
   NS_IMETHOD PrivateNoteIntentionalCrash();
 
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture)
   {
     // By default add listeners only for trusted events!
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
-                                                    aUseCapture, PR_FALSE, 1);
+                                                    aUseCapture, PR_FALSE, 2);
   }
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture, PRBool aWantsUntrusted,
                               PRUint8 optional_argc)
   {
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
                                                     aUseCapture,