Bug 648872 - use NS_STDCALL_FUNCPROTO; r=bzbarsky
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Thu, 14 Apr 2011 15:54:27 -0400
changeset 68174 59111031d49a2d8ab9236251f9ddeb0a6f19c308
parent 68173 784db2f4b6acadf9e24a6d37b308392082d08097
child 68175 17e83dd4fc1f63ef87def58fcab3c24f5cd63062
push id19528
push usereakhgari@mozilla.com
push dateFri, 15 Apr 2011 13:35:33 +0000
treeherdermozilla-central@754e793c647e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbzbarsky
bugs648872
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 648872 - use NS_STDCALL_FUNCPROTO; r=bzbarsky
dom/src/threads/nsDOMWorker.h
dom/src/threads/nsDOMWorkerXHRProxy.h
--- a/dom/src/threads/nsDOMWorker.h
+++ b/dom/src/threads/nsDOMWorker.h
@@ -74,33 +74,33 @@ class nsIScriptGlobalObject;
 class nsIXPConnectWrappedNative;
 
 class nsDOMWorkerScope : public nsDOMWorkerMessageHandler,
                          public nsIWorkerScope,
                          public nsIXPCScriptable
 {
   friend class nsDOMWorker;
 
-  typedef nsresult (NS_STDCALL nsDOMWorkerScope::*SetListenerFunc)
-    (nsIDOMEventListener*);
-
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMEVENTTARGET
   // nsIDOMNSEventTarget
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture,
                               PRBool aWantsUntrusted,
                               PRUint8 optional_argc);
   NS_DECL_NSIWORKERGLOBALSCOPE
   NS_DECL_NSIWORKERSCOPE
   NS_DECL_NSIXPCSCRIPTABLE
   NS_DECL_NSICLASSINFO
 
+  typedef NS_STDCALL_FUNCPROTO(nsresult, SetListenerFunc, nsDOMWorkerScope,
+                               SetOnmessage, (nsIDOMEventListener*));
+
   nsDOMWorkerScope(nsDOMWorker* aWorker);
 
 protected:
   already_AddRefed<nsIXPConnectWrappedNative> GetWrappedNative();
 
 private:
   nsDOMWorker* mWorker;
   nsIXPConnectWrappedNative* mWrappedNative;
--- a/dom/src/threads/nsDOMWorkerXHRProxy.h
+++ b/dom/src/threads/nsDOMWorkerXHRProxy.h
@@ -40,16 +40,17 @@
 #define __NSDOMWORKERXHRPROXY_H__
 
 // Bases
 #include "nsThreadUtils.h"
 #include "nsIDOMEventListener.h"
 #include "nsIRequestObserver.h"
 
 // Other includes
+#include "nsIDOMEventTarget.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 
 class nsIJSXMLHttpRequest;
 class nsIThread;
 class nsIVariant;
@@ -69,18 +70,19 @@ class nsDOMWorkerXHRProxy : public nsIRu
 {
   friend class nsDOMWorkerXHRAttachUploadListenersRunnable;
   friend class nsDOMWorkerXHREvent;
   friend class nsDOMWorkerXHRFinishSyncXHRRunnable;
   friend class nsDOMWorkerXHRLastProgressOrLoadEvent;
   friend class nsDOMWorkerXHR;
   friend class nsDOMWorkerXHRUpload;
 
-  typedef nsresult (NS_STDCALL nsIDOMEventTarget::*EventListenerFunction)
-    (const nsAString&, nsIDOMEventListener*, PRBool);
+  typedef NS_STDCALL_FUNCPROTO(nsresult, EventListenerFunction, nsIDOMEventTarget,
+                               AddEventListener,
+                               (const nsAString&, nsIDOMEventListener*, PRBool));
 
 public:
   typedef nsAutoTArray<nsCOMPtr<nsIRunnable>, 5> SyncEventQueue;
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
   NS_DECL_NSIRUNNABLE
   NS_DECL_NSIREQUESTOBSERVER