From 308c62701ac591b01eb38eca1d2aede32f73da6c Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Wed, 13 Jan 2010 14:50:01 +0100
Subject: [PATCH] Fix for bug 428229 (Unable to override addEventListener),
 quickstub addEventListener. r=bz.

--HG--
extra : rebase_source : 1e8779a8089e19f56c51ae34deed7284147df2ab
---
 dom/interfaces/events/nsIDOMEventTarget.idl | 2 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dom/interfaces/events/nsIDOMEventTarget.idl b/dom/interfaces/events/nsIDOMEventTarget.idl
index 817824cb7c63..38d564aaa15b 100644
--- a/dom/interfaces/events/nsIDOMEventTarget.idl
+++ b/dom/interfaces/events/nsIDOMEventTarget.idl
@@ -77,7 +77,7 @@ interface nsIDOMEventTarget : nsISupports
    *                     through the tree will not trigger an 
    *                     EventListener designated to use capture.
    */
-  void                     addEventListener(in DOMString type,
+  [noscript] void          addEventListener(in DOMString type,
                                             in nsIDOMEventListener listener,
                                             in boolean useCapture);
 
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 374379996f48..c8667ebce4a4 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -243,10 +243,7 @@ members = [
     # dom/interfaces/events
     'nsIDOMEventTarget.dispatchEvent',
     'nsIDOMEventTarget.removeEventListener',
-    # Conflicts with nsIDOMNSEventTarget.addEventListener;
-    # the conflict is specially resolved in nsDOMClassInfo.cpp.
-    # (See bug 453331.)
-    #'nsIDOMEventTarget.addEventListener',
+    'nsIDOMNSEventTarget.addEventListener',
     'nsIDOMDocumentEvent.createEvent',
 
     'nsIDOMEvent.*',