Merge

dom/public/idl/events/Makefile.in

@@ -54,6 +54,7 @@ SDK_XPIDLSRCS =                                 \
 	nsIDOM3DocumentEvent.idl		\
 	nsIDOM3EventTarget.idl			\
 	nsIDOMEventGroup.idl			\
+	nsIDOMCustomEvent.idl			\
 	nsIDOMMouseEvent.idl			\
 	nsIDOMMouseScrollEvent.idl      \
 	nsIDOMUIEvent.idl			\

dom/public/idl/events/nsIDOMCustomEvent.idl

@@ -0,0 +1,56 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Tom Pixley <joki@netscape.com> (original author)
+ *   Johnny Stenback <jst@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIDOMEvent.idl"
+
+/**
+ * The nsIDOMEventTarget interface is the interface implemented by all
+ * event targets in the Document Object Model.
+ *
+ * For more information on this interface please see 
+ * http://www.w3.org/TR/DOM-Level-3-Events/
+ */
+
+[scriptable, uuid(55c7af7b-1a64-40bf-87eb-2c2cbee0491b)]
+interface nsIDOMCustomEvent : nsIDOMEvent
+{
+  void               setCurrentTarget(in nsIDOMNode target);
+  void               setEventPhase(in unsigned short phase);
+
+};

js/src/xpconnect/src/dom_quickstubs.qsconf

@@ -273,6 +273,8 @@ members = [
     # (See bug 453331.)
     #'nsIDOMEventTarget.addEventListener',
     'nsIDOMEventListener.handleEvent',
+    'nsIDOMCustomEvent.setCurrentTarget',
+    'nsIDOMCustomEvent.setEventPhase',
     'nsIDOMDocumentEvent.createEvent',
     'nsIDOMMouseEvent.clientX',
     'nsIDOMMouseEvent.clientY',

modules/plugin/os2wrapper/moz_IDs_Generated.h

@@ -684,6 +684,9 @@ NP_DEF_ID(kDOMCSSValueIID, NS_IDOMCSSVALUE_IID);
 #ifdef NS_IDOMCSSVALUELIST_IID
 NP_DEF_ID(kDOMCSSValueListIID, NS_IDOMCSSVALUELIST_IID);
 #endif
+#ifdef NS_IDOMCUSTOMEVENT_IID
+NP_DEF_ID(kDOMCustomEventIID, NS_IDOMCUSTOMEVENT_IID);
+#endif
 #ifdef NS_IDOMDOCUMENT_IID
 NP_DEF_ID(kDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 #endif
@@ -3604,6 +3607,9 @@ static struct nsIDNameLookupEntry
 #ifdef NS_IDOMCSSVALUELIST_IID
     { &kDOMCSSValueListIID, "NS_IDOMCSSVALUELIST_IID" },
 #endif
+#ifdef NS_IDOMCUSTOMEVENT_IID
+    { &kDOMCustomEventIID, "NS_IDOMCUSTOMEVENT_IID" },
+#endif
 #ifdef NS_IDOMDOCUMENT_IID
     { &kDOMDocumentIID, "NS_IDOMDOCUMENT_IID" },
 #endif
@@ -6524,6 +6530,9 @@ static struct nsLookupStrIDEntry
 #ifdef NS_IDOMCSSVALUELIST_IID_STR
     { &kDOMCSSValueListIID, NS_IDOMCSSVALUELIST_IID_STR },
 #endif
+#ifdef NS_IDOMCUSTOMEVENT_IID_STR
+    { &kDOMCustomEventIID, NS_IDOMCUSTOMEVENT_IID_STR },
+#endif
 #ifdef NS_IDOMDOCUMENT_IID_STR
     { &kDOMDocumentIID, NS_IDOMDOCUMENT_IID_STR },
 #endif

modules/plugin/os2wrapper/moz_IDs_Input.lst

@@ -209,6 +209,7 @@ nsIDOMCSSStyleSheet
 nsIDOMCSSUnknownRule
 nsIDOMCSSValue
 nsIDOMCSSValueList
+nsIDOMCustomEvent
 nsIDOMDocument
 nsIDOMDocumentCSS
 nsIDOMDocumentEvent