Landing the XPCDOM_20010329_BRANCH branch, changes mostly done by jband@netscape.com and jst@netscape.com, also some changes done by shaver@mozilla.org, peterv@netscape.com and markh@activestate.com. r= and sr= by vidur@netscape.com, jband@netscape.com, jst@netscpae.com, danm@netscape.com, hyatt@netscape.com, shaver@mozilla.org, dbradley@netscape.com, rpotts@netscape.com.

chrome/src/nsChromeRegistry.cpp

@@ -2569,8 +2569,9 @@ nsChromeRegistry::ReloadChrome()
       while (more) {
         nsCOMPtr<nsISupports> protoWindow;
         rv = windowEnumerator->GetNext(getter_AddRefs(protoWindow));
-        if (NS_SUCCEEDED(rv) && protoWindow) {
-          nsCOMPtr<nsPIDOMWindow> domWindow = do_QueryInterface(protoWindow);
+        if (NS_SUCCEEDED(rv)) {
+          nsCOMPtr<nsIDOMWindowInternal> domWindow =
+            do_QueryInterface(protoWindow);
           if (domWindow) {
             nsCOMPtr<nsIDOMLocation> location;
             domWindow->GetLocation(getter_AddRefs(location));

content/base/src/nsSyncLoadService.cpp

@@ -40,6 +40,7 @@
 #include "nsIAppShellService.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestor.h"
+#include "jsapi.h"
 
 static const char* kLoadAsData = "loadAsData";
 
@@ -65,13 +66,13 @@ public:
     NS_DECL_ISUPPORTS
 
     // nsIDOMEventListener
-    virtual nsresult HandleEvent(nsIDOMEvent* aEvent);
+    NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
     // nsIDOMLoadListener
-    virtual nsresult Load(nsIDOMEvent* aEvent);
-    virtual nsresult Unload(nsIDOMEvent* aEvent);
-    virtual nsresult Abort(nsIDOMEvent* aEvent);
-    virtual nsresult Error(nsIDOMEvent* aEvent);
+    NS_IMETHOD Load(nsIDOMEvent* aEvent);
+    NS_IMETHOD Unload(nsIDOMEvent* aEvent);
+    NS_IMETHOD Abort(nsIDOMEvent* aEvent);
+    NS_IMETHOD Error(nsIDOMEvent* aEvent);
 
 protected:
     nsWeakPtr  mParent;
@@ -89,7 +90,7 @@ nsLoadListenerProxy::~nsLoadListenerProxy()
 
 NS_IMPL_ISUPPORTS1(nsLoadListenerProxy, nsIDOMLoadListener)
 
-nsresult
+NS_IMETHODIMP
 nsLoadListenerProxy::HandleEvent(nsIDOMEvent* aEvent)
 {
     nsCOMPtr<nsIDOMLoadListener> listener = do_QueryReferent(mParent);
@@ -101,7 +102,7 @@ nsLoadListenerProxy::HandleEvent(nsIDOMEvent* aEvent)
     return NS_OK;
 }
 
-nsresult 
+NS_IMETHODIMP
 nsLoadListenerProxy::Load(nsIDOMEvent* aEvent)
 {
     nsCOMPtr<nsIDOMLoadListener> listener = do_QueryReferent(mParent);
@@ -113,7 +114,7 @@ nsLoadListenerProxy::Load(nsIDOMEvent* aEvent)
     return NS_OK;
 }
 
-nsresult 
+NS_IMETHODIMP
 nsLoadListenerProxy::Unload(nsIDOMEvent* aEvent)
 {
     nsCOMPtr<nsIDOMLoadListener> listener = do_QueryReferent(mParent);
@@ -125,7 +126,7 @@ nsLoadListenerProxy::Unload(nsIDOMEvent* aEvent)
     return NS_OK;
 }
 
-nsresult 
+NS_IMETHODIMP
 nsLoadListenerProxy::Abort(nsIDOMEvent* aEvent)
 {
     nsCOMPtr<nsIDOMLoadListener> listener = do_QueryReferent(mParent);
@@ -137,7 +138,7 @@ nsLoadListenerProxy::Abort(nsIDOMEvent* aEvent)
     return NS_OK;
 }
 
-nsresult 
+NS_IMETHODIMP
 nsLoadListenerProxy::Error(nsIDOMEvent* aEvent)
 {
     nsCOMPtr<nsIDOMLoadListener> listener = do_QueryReferent(mParent);

dom/Makefile.in

@@ -28,9 +28,5 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
-ifdef BUILD_IDLC
-DIRS		+= tools
-endif
-
 include $(topsrcdir)/config/rules.mk
 

dom/public/MANIFEST

@@ -24,15 +24,13 @@ nsIScriptContext.h
 nsIJSScriptObject.h
 nsIJSNativeInitializer.h
 nsIScriptObjectOwner.h
+nsIScriptObjectPrincipal.h
 nsIScriptGlobalObject.h
 nsIScriptEventListener.h
 nsIDOMScriptObjectFactory.h
-nsIDOMNativeObjectRegistry.h
 nsDOMCID.h
-nsDOMPropEnums.h
-nsDOMPropNames.h
-nsIScriptNameSetRegistry.h
 nsIScriptExternalNameSet.h
 nsIScriptNameSpaceManager.h
 nsDOMError.h
 nsIJSEventListener.h
+nsIDOMClassInfo.h

dom/public/MANIFEST_IDL

@@ -1,4 +0,0 @@
-domstubs.idl
-nsIScriptContextOwner.idl
-nsIScriptGlobalObjectOwner.idl
-nsIEntropyCollector.idl

dom/public/Makefile.in

@@ -28,34 +28,28 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 
-DIRS		= base coreDom coreEvents range events html css xul
+DIRS		= idl coreEvents base
 
-XPIDLSRCS	= domstubs.idl \
-				  nsIScriptContextOwner.idl \
-				  nsIScriptGlobalObjectOwner.idl \
-				  nsIEntropyCollector.idl \
-				  $(NULL)
+XPIDLSRCS	= nsIScriptContextOwner.idl \
+		  nsIScriptGlobalObjectOwner.idl \
+		  nsIEntropyCollector.idl \
+		  $(NULL)
 
-EXPORTS		= \
-		nsIScriptContext.h \
-		nsIJSScriptObject.h \
-		nsIJSNativeInitializer.h \
-		nsIScriptEventListener.h \
-		nsIScriptObjectOwner.h \
-		nsIScriptGlobalObject.h \
-		nsIDOMScriptObjectFactory.h \
-		nsIDOMNativeObjectRegistry.h \
-		nsDOMCID.h \
-		nsDOMPropEnums.h \
-		nsDOMPropNames.h \
-		nsIScriptNameSetRegistry.h \
-		nsIScriptExternalNameSet.h \
-		nsIScriptNameSpaceManager.h \
-		nsDOMError.h \
-		nsIJSEventListener.h \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS=nsIScriptContext.h		\
+	nsIJSScriptObject.h		\
+	nsIJSNativeInitializer.h	\
+	nsIScriptObjectOwner.h		\
+	nsIScriptObjectPrincipal.h	\
+	nsIScriptGlobalObject.h		\
+	nsIScriptEventListener.h	\
+	nsIDOMScriptObjectFactory.h	\
+	nsDOMCID.h			\
+	nsIScriptExternalNameSet.h	\
+	nsIScriptNameSpaceManager.h	\
+	nsDOMError.h			\
+	nsIJSEventListener.h		\
+	nsIDOMClassInfo.h		\
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

dom/public/base/MANIFEST

@@ -1,45 +0,0 @@
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-# This is a list of local files which get copied to the mozilla:dist:dom directory
-#
-
-nsIDOMWindow.h
-nsIDOMWindowInternal.h
-nsIDOMLocation.h
-nsIDOMNSLocation.h
-nsIDOMNavigator.h
-nsIDOMWindowCollection.h
-nsIDOMScreen.h
-nsIDOMHistory.h
-nsIDOMMimeType.h
-nsIDOMMimeTypeArray.h
-nsIDOMPlugin.h
-nsIDOMPluginArray.h
-nsIDOMBarProp.h
-nsIDOMDOMException.h
-nsPIDOMWindow.h
-nsPIWindowRoot.h
-nsIFocusController.h
-nsIDOMAbstractView.h
-nsIDOMCrypto.h
-nsIDOMCRMFObject.h
-nsIDOMPkcs11.h
-nsIDOMViewCSS.h
-nsIDOMWindowEventOwner.h

dom/public/base/Makefile.in

@@ -28,33 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 
-EXPORTS		= \
-		nsIDOMWindow.h \
-		nsIDOMWindowInternal.h \
-		nsIDOMNavigator.h \
-		nsIDOMLocation.h \
-		nsIDOMNSLocation.h \
-		nsIDOMWindowCollection.h \
-		nsIDOMScreen.h \
-		nsIDOMHistory.h \
-		nsIDOMMimeType.h \
-		nsIDOMMimeTypeArray.h \
-		nsIDOMPlugin.h \
-		nsIDOMPluginArray.h \
-		nsIDOMBarProp.h \
-		nsIDOMDOMException.h \
-		nsPIDOMWindow.h \
-    nsPIWindowRoot.h \
-    nsIFocusController.h \
-		nsIDOMAbstractView.h \
-		nsIDOMViewCSS.h \
-		nsIDOMCRMFObject.h \
-		nsIDOMCrypto.h \
-		nsIDOMPkcs11.h \
-		nsIDOMWindowEventOwner.h \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS=nsPIDOMWindow.h nsPIWindowRoot.h nsIFocusController.h
 
 include $(topsrcdir)/config/rules.mk
 

dom/public/base/makefile.win

@@ -23,14 +23,7 @@ DEPTH=..\..\..
 
 
 DEFINES=-D_IMPL_NS_DOM 
-EXPORTS=nsIDOMWindow.h nsIDOMWindowInternal.h nsIDOMNavigator.h \
-	nsIDOMLocation.h nsIDOMNSLocation.h \
-	nsIDOMWindowCollection.h nsIDOMScreen.h nsIDOMHistory.h \
-	nsIDOMMimeType.h nsIDOMMimeTypeArray.h \
-	nsIDOMPlugin.h nsIDOMPluginArray.h nsIDOMBarProp.h \
-	nsIDOMDOMException.h nsPIDOMWindow.h nsPIWindowRoot.h nsIDOMAbstractView.h \
-	nsIDOMViewCSS.h nsIDOMCRMFObject.h nsIDOMCrypto.h nsIDOMPkcs11.h \
-	nsIDOMWindowEventOwner.h nsIFocusController.h
+EXPORTS=nsPIDOMWindow.h nsPIWindowRoot.h nsIFocusController.h
 
 MODULE=dom 
 

dom/public/base/nsPIDOMWindow.h

@@ -38,39 +38,34 @@ class nsIChromeEventHandler;
 class nsIFocusController;
 
 #define NS_PIDOMWINDOW_IID \
-{ 0x3aa80781, 0x7e6a, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
+{ 0x3aa80781, 0x7e6a, 0x11d3, \
+ { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
 
-class nsPIDOMWindow : public nsISupports {
+class nsPIDOMWindow : public nsISupports
+{
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_PIDOMWINDOW_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_PIDOMWINDOW_IID)
 
-  NS_IMETHOD GetPrivateParent(nsPIDOMWindow** aResult)=0;
-  NS_IMETHOD GetPrivateRoot(nsIDOMWindowInternal** aResult)=0;
+  NS_IMETHOD GetPrivateParent(nsPIDOMWindow** aResult) = 0;
+  NS_IMETHOD GetPrivateRoot(nsIDOMWindowInternal** aResult) = 0;
 
-  NS_IMETHOD GetLocation(nsIDOMLocation** aLocation) = 0;
-
-  NS_IMETHOD SetObjectProperty(const PRUnichar* aProperty, nsISupports* aObject)=0;
-  NS_IMETHOD GetObjectProperty(const PRUnichar* aProperty, nsISupports** aObject)=0;
+  NS_IMETHOD GetObjectProperty(const PRUnichar* aProperty,
+                               nsISupports** aObject) = 0;
   
-  // This is private because activate/deactivate events are not part of the DOM spec.
+  // This is private because activate/deactivate events are not part
+  // of the DOM spec.
   NS_IMETHOD Activate() = 0;
   NS_IMETHOD Deactivate() = 0;
 
-  NS_IMETHOD GetChromeEventHandler(nsIChromeEventHandler** aHandler)=0;
+  NS_IMETHOD GetChromeEventHandler(nsIChromeEventHandler** aHandler) = 0;
 
-  NS_IMETHOD HasMutationListeners(PRUint32 aMutationEventType, PRBool* aResult)=0;
-  NS_IMETHOD SetMutationListeners(PRUint32 aType)=0;
-
-  NS_IMETHOD GetRootFocusController(nsIFocusController** aResult)=0;
-
-  /* from nsIBaseWindow */
-  /* void setPositionAndSize (in long x, in long y, in long cx, in long cy, in boolean fRepaint); */
-  NS_IMETHOD SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy, PRBool fRepaint) = 0;
-
-  /* void getPositionAndSize (out long x, out long y, out long cx, out long cy); */
-  NS_IMETHOD GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) = 0;
+  NS_IMETHOD HasMutationListeners(PRUint32 aMutationEventType,
+                                  PRBool* aResult) = 0;
+  NS_IMETHOD SetMutationListeners(PRUint32 aType) = 0;
 
+  NS_IMETHOD GetRootFocusController(nsIFocusController** aResult) = 0;
 
+  NS_IMETHOD ReallyCloseWindow() = 0;
 };
 
 #endif // nsPIDOMWindow_h__

dom/public/coreEvents/MANIFEST

@@ -2,13 +2,6 @@
 # This is a list of local files which get copied to the mozilla:dist:dom directory
 #
 
-nsIDOMEvent.h
-nsIDOMUIEvent.h
-nsIDOMKeyEvent.h
-nsIDOMMouseEvent.h
-nsIDOMMutationEvent.h
-nsIDOMNSUIEvent.h
-nsIDOMEventListener.h
 nsIDOMEventCapturer.h
 nsIDOMEventReceiver.h
 nsIDOMFocusListener.h
@@ -20,7 +13,6 @@ nsIDOMMouseMotionListener.h
 nsIDOMMutationListener.h
 nsIDOMDragListener.h
 nsIDOMPaintListener.h
-nsIDOMEventTarget.h
 nsIDOMTextListener.h
 nsIDOMCompositionListener.h
 nsIDOMMenuListener.h

dom/public/coreEvents/Makefile.in

@@ -28,34 +28,24 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
 
-EXPORTS		= \
-		nsIDOMEvent.h \
-		nsIDOMUIEvent.h \
-		nsIDOMKeyEvent.h \
-		nsIDOMMouseEvent.h \
-    nsIDOMMutationEvent.h \
-		nsIDOMEventListener.h \
-		nsIDOMEventCapturer.h \
-		nsIDOMEventReceiver.h \
-		nsIDOMFocusListener.h \
-		nsIDOMFormListener.h \
-		nsIDOMKeyListener.h \
-		nsIDOMLoadListener.h \
-		nsIDOMMouseListener.h \
-		nsIDOMMouseMotionListener.h \
-    nsIDOMMutationListener.h \
-		nsIDOMPaintListener.h \
-		nsIDOMDragListener.h \
-		nsIDOMNSUIEvent.h \
-		nsIDOMEventTarget.h \
-		nsIDOMTextListener.h \
-		nsIDOMCompositionListener.h \
-		nsIDOMMenuListener.h \
-		nsIDOMScrollListener.h \
-		nsIDOMContextMenuListener.h \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS =				\
+	nsIDOMEventCapturer.h		\
+	nsIDOMEventReceiver.h		\
+	nsIDOMFocusListener.h		\
+	nsIDOMFormListener.h		\
+	nsIDOMKeyListener.h		\
+	nsIDOMLoadListener.h		\
+	nsIDOMMouseListener.h		\
+	nsIDOMMouseMotionListener.h	\
+	nsIDOMMutationListener.h	\
+	nsIDOMPaintListener.h		\
+	nsIDOMDragListener.h		\
+	nsIDOMTextListener.h		\
+	nsIDOMCompositionListener.h	\
+	nsIDOMMenuListener.h		\
+	nsIDOMScrollListener.h		\
+	nsIDOMContextMenuListener.h	\
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

dom/public/coreEvents/makefile.win

@@ -22,15 +22,9 @@
 DEPTH=..\..\..
 
 
-DEFINES=-D_IMPL_NS_DOM 
+DEFINES=-D_IMPL_NS_DOM
 
 EXPORTS =				\
-	nsIDOMEvent.h			\
-	nsIDOMUIEvent.h			\
-	nsIDOMKeyEvent.h			\
-	nsIDOMMouseEvent.h			\
-  nsIDOMMutationEvent.h \
-	nsIDOMEventListener.h		\
 	nsIDOMEventCapturer.h		\
 	nsIDOMEventReceiver.h		\
 	nsIDOMFocusListener.h		\
@@ -39,16 +33,14 @@ EXPORTS =				\
 	nsIDOMLoadListener.h		\
 	nsIDOMMouseListener.h		\
 	nsIDOMMouseMotionListener.h	\
-  nsIDOMMutationListener.h \
+	nsIDOMMutationListener.h	\
 	nsIDOMPaintListener.h		\
 	nsIDOMDragListener.h		\
-	nsIDOMNSUIEvent.h			\
-	nsIDOMEventTarget.h		\
 	nsIDOMTextListener.h		\
 	nsIDOMCompositionListener.h	\
-	nsIDOMMenuListener.h        \
-	nsIDOMScrollListener.h        \
-	nsIDOMContextMenuListener.h        \
+	nsIDOMMenuListener.h		\
+	nsIDOMScrollListener.h		\
+	nsIDOMContextMenuListener.h	\
 	$(NULL)
 
 MODULE=dom

dom/public/coreEvents/nsIDOMCompositionListener.h

@@ -41,9 +41,9 @@ public:
 
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMCOMPOSITIONLISTENER_IID)
 
-  virtual nsresult HandleStartComposition(nsIDOMEvent* aCompositionEvent) = 0;
-  virtual nsresult HandleEndComposition(nsIDOMEvent* aCompositionEvent) = 0;
-  virtual nsresult HandleQueryComposition(nsIDOMEvent* aCompositionEvent) = 0;
-  virtual nsresult HandleQueryReconversion(nsIDOMEvent* aCompositionEvent) = 0;
+  NS_IMETHOD HandleStartComposition(nsIDOMEvent* aCompositionEvent) = 0;
+  NS_IMETHOD HandleEndComposition(nsIDOMEvent* aCompositionEvent) = 0;
+  NS_IMETHOD HandleQueryComposition(nsIDOMEvent* aCompositionEvent) = 0;
+  NS_IMETHOD HandleQueryReconversion(nsIDOMEvent* aCompositionEvent) = 0;
 };
 #endif // nsIDOMCompositionListener_h__

dom/public/coreEvents/nsIDOMContextMenuListener.h

@@ -45,7 +45,7 @@ public:
   * @param aContextMenuEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult ContextMenu(nsIDOMEvent* aContextMenuEvent) = 0;
+  NS_IMETHOD ContextMenu(nsIDOMEvent* aContextMenuEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMDragListener.h

@@ -47,35 +47,35 @@ public:
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult DragEnter(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragEnter(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
   * Processes a drag over event
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult DragOver(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragOver(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
   * Processes a drag Exit event
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult DragExit(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragExit(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a drag drop event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult DragDrop(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragDrop(nsIDOMEvent* aMouseEvent) = 0;
   
   /**
    * Processes a drag gesture event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult DragGesture(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragGesture(nsIDOMEvent* aMouseEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMFocusListener.h

@@ -36,8 +36,8 @@
 0x80974670, 0xded6, 0x11d1, \
 {0xbd, 0x85, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4} }
 
-class nsIDOMFocusListener : public nsIDOMEventListener {
-
+class nsIDOMFocusListener : public nsIDOMEventListener
+{
 public:
 
   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMFOCUSLISTENER_IID)
@@ -47,15 +47,14 @@ public:
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Focus(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Focus(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a blur event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Blur(nsIDOMEvent* aEvent) = 0;
-
+  NS_IMETHOD Blur(nsIDOMEvent* aEvent) = 0;
 };
 
 #endif // nsIDOMFocusListener_h__

dom/public/coreEvents/nsIDOMFormListener.h

@@ -45,35 +45,35 @@ public:
   * @param aEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Submit(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Submit(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a form reset event
    * @param aEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Reset(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Reset(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a form change event
    * @param aEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Change(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Change(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a form select event
    * @param aEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Select(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Select(nsIDOMEvent* aEvent) = 0;
   
   /**
    * Processes a form input event
    * @param aEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Input(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Input(nsIDOMEvent* aEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMKeyListener.h

@@ -45,14 +45,14 @@ public:
      * @param aKeyEvent @see nsIDOMEvent.h 
      * @returns whether the event was consumed or ignored. @see nsresult
      */
-    virtual nsresult KeyDown(nsIDOMEvent* aKeyEvent) = 0;
+    NS_IMETHOD KeyDown(nsIDOMEvent* aKeyEvent) = 0;
 
     /**
      * Processes a key release event
      * @param aKeyEvent @see nsIDOMEvent.h 
      * @returns whether the event was consumed or ignored. @see nsresult
      */
-    virtual nsresult KeyUp(nsIDOMEvent* aKeyEvent) = 0;
+    NS_IMETHOD KeyUp(nsIDOMEvent* aKeyEvent) = 0;
 
     /**
      * Processes a key typed event
@@ -60,7 +60,7 @@ public:
      * @returns whether the event was consumed or ignored. @see nsresult
      *
      */
-    virtual nsresult KeyPress(nsIDOMEvent* aKeyEvent) = 0;
+    NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent) = 0;
 
 };
 #endif // nsIDOMKeyListener_h__

dom/public/coreEvents/nsIDOMLoadListener.h

@@ -45,14 +45,14 @@ public:
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Load(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Load(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a page unload event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Unload(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Unload(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes a load abort event
@@ -60,14 +60,14 @@ public:
    * @returns whether the event was consumed or ignored. @see nsresult
    *
    */
-  virtual nsresult Abort(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Abort(nsIDOMEvent* aEvent) = 0;
 
   /**
    * Processes an load error event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult Error(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Error(nsIDOMEvent* aEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMMouseListener.h

@@ -47,14 +47,14 @@ public:
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult MouseDown(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a mouse up event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult MouseUp(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a mouse click event
@@ -62,7 +62,7 @@ public:
    * @returns whether the event was consumed or ignored. @see nsresult
    *
    */
-  virtual nsresult MouseClick(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a mouse click event
@@ -70,21 +70,21 @@ public:
    * @returns whether the event was consumed or ignored. @see nsresult
    *
    */
-  virtual nsresult MouseDblClick(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a mouse enter event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult MouseOver(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a mouse leave event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult MouseOut(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMMouseMotionListener.h

@@ -45,14 +45,14 @@ public:
   * @param aMouseEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult MouseMove(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent) = 0;
 
   /**
    * Processes a drag move event
    * @param aMouseEvent @see nsIDOMEvent.h 
    * @returns whether the event was consumed or ignored. @see nsresult
    */
-  virtual nsresult DragMove(nsIDOMEvent* aMouseEvent) = 0;
+  NS_IMETHOD DragMove(nsIDOMEvent* aMouseEvent) = 0;
 
 };
 

dom/public/coreEvents/nsIDOMPaintListener.h

@@ -40,21 +40,21 @@ public:
   * @param aEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Paint(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Paint(nsIDOMEvent* aEvent) = 0;
 
   /**
   * Processes a resize event
   * @param aEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Resize(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Resize(nsIDOMEvent* aEvent) = 0;
 
   /**
   * Processes a scroll event
   * @param aEvent @see nsIDOMEvent.h 
   * @returns whether the event was consumed or ignored. @see nsresult
   */
-  virtual nsresult Scroll(nsIDOMEvent* aEvent) = 0;
+  NS_IMETHOD Scroll(nsIDOMEvent* aEvent) = 0;
 };
 
 #endif /* nsIDOMPaintListener_h__ */

dom/public/coreEvents/nsIDOMTextListener.h

@@ -34,13 +34,13 @@
 { 0xc6296e81, 0xd823, 0x11d2, { 0x9e, 0x7f, 0x0, 0x60, 0x8, 0x9f, 0xe5, 0x9b } }
 
 
-class nsIDOMTextListener : public nsIDOMEventListener {
-
+class nsIDOMTextListener : public nsIDOMEventListener
+{
 public:
 
-      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMTEXTLISTENER_IID)
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMTEXTLISTENER_IID)
 
-    virtual nsresult HandleText(nsIDOMEvent* aTextEvent) = 0;
+  NS_IMETHOD HandleText(nsIDOMEvent* aTextEvent) = 0;
 
 };
 #endif // nsIDOMTextListener_h__