Bug 1265951 - Port |Bug 1265927| to MailNews. r=philipp,rkent
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 26 Apr 2016 21:43:00 +0800
changeset 24963 b769b07627bb70ecef1099f561d6c1285812aa20
parent 24962 ba7f2327504b8ad689ceca5a8ffe2392c3ef596b
child 24964 0e1299ac02ccbd74c33a0f63099056de7319a634
push id1688
push userclokep@gmail.com
push dateMon, 01 Aug 2016 16:45:40 +0000
treeherdercomm-beta@9abd7cedb2af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp, rkent
bugs1265951, 1265927
Bug 1265951 - Port |Bug 1265927| to MailNews. r=philipp,rkent
calendar/base/backend/libical/calICSService.h
ldap/xpcom/src/nsLDAPConnection.cpp
mailnews/base/src/nsMsgAccountManager.cpp
mailnews/base/src/nsMsgContentPolicy.cpp
mailnews/base/src/nsMsgPrintEngine.cpp
mailnews/base/util/nsMsgDBFolder.cpp
mailnews/imap/src/nsImapProtocol.cpp
mailnews/imap/src/nsSyncRunnableHelpers.cpp
mailnews/import/src/nsImportMail.cpp
mailnews/import/src/nsImportService.cpp
mailnews/mime/src/mimecms.cpp
--- a/calendar/base/backend/libical/calICSService.h
+++ b/calendar/base/backend/libical/calICSService.h
@@ -16,17 +16,17 @@ extern "C" {
 #include "ical.h"
 }
 
 class calICSService : public calIICSService,
                       public cal::XpcomBase
 {
 protected:
     virtual ~calICSService() {}
-    class ParserWorker : public nsRunnable {
+    class ParserWorker : public mozilla::Runnable {
     public:
       ParserWorker(nsIThread *mainThread,
                    nsIThread *workerThread,
                    const nsACString &icsString,
                    calITimezoneProvider *tzProvider,
                    calIIcsComponentParsingListener *listener) :
         mString(icsString), mProvider(tzProvider),
         mMainThread(mainThread), mWorkerThread(workerThread)
@@ -38,17 +38,17 @@ protected:
 
     protected:
       nsCString mString;
       nsCOMPtr<calITimezoneProvider> mProvider;
       nsMainThreadPtrHandle<calIIcsComponentParsingListener> mListener;
       nsCOMPtr<nsIThread> mMainThread;
       nsCOMPtr<nsIThread> mWorkerThread;
 
-      class ParserWorkerCompleter : public nsRunnable {
+      class ParserWorkerCompleter : public mozilla::Runnable {
       public:
         ParserWorkerCompleter(nsIThread *workerThread,
                               nsresult status,
                               calIIcalComponent *component,
                               const nsMainThreadPtrHandle<calIIcsComponentParsingListener> &listener) :
           mWorkerThread(workerThread), mListener(listener),
           mComp(component), mStatus(status)
         {
--- a/ldap/xpcom/src/nsLDAPConnection.cpp
+++ b/ldap/xpcom/src/nsLDAPConnection.cpp
@@ -372,17 +372,17 @@ nsLDAPConnection::RemovePendingOperation
            ("nsLDAPConnection::RemovePendingOperation(): operation "
             "removed; total pending operations now = %d\n",
             mPendingOperations.Count()));
   }
 
   return NS_OK;
 }
 
-class nsOnLDAPMessageRunnable : public nsRunnable
+class nsOnLDAPMessageRunnable : public Runnable
 {
 public:
   nsOnLDAPMessageRunnable(nsLDAPMessage *aMsg, bool aClear)
     : m_msg(aMsg)
     , m_clear(aClear)
   {}
   NS_DECL_NSIRUNNABLE
 private:
--- a/mailnews/base/src/nsMsgAccountManager.cpp
+++ b/mailnews/base/src/nsMsgAccountManager.cpp
@@ -2497,17 +2497,17 @@ nsMsgAccountManager::GetChromePackageNam
 
       if (name.Equals(aExtensionName))
         return extension->GetChromePackageName(aChromePackageName);
     }
   }
   return NS_ERROR_UNEXPECTED;
 }
 
-class VFChangeListenerEvent : public nsRunnable
+class VFChangeListenerEvent : public mozilla::Runnable
 {
 public:
   VFChangeListenerEvent(VirtualFolderChangeListener *vfChangeListener,
                         nsIMsgFolder *virtFolder, nsIMsgDatabase *virtDB)
     : mVFChangeListener(vfChangeListener), mFolder(virtFolder), mDB(virtDB)
   {}
 
   NS_IMETHOD Run()
--- a/mailnews/base/src/nsMsgContentPolicy.cpp
+++ b/mailnews/base/src/nsMsgContentPolicy.cpp
@@ -472,17 +472,17 @@ nsMsgContentPolicy::ShouldAcceptRemoteCo
 
   // kNoRemoteContentPolicy means we have never set a value on the message
   if (result == nsIContentPolicy::REJECT_REQUEST && !remoteContentPolicy)
     aMsgHdr->SetUint32Property("remoteContentPolicy", kBlockRemoteContent);
 
   return result;
 }
 
-class RemoteContentNotifierEvent : public nsRunnable
+class RemoteContentNotifierEvent : public mozilla::Runnable
 {
 public:
   RemoteContentNotifierEvent(nsIMsgWindow *aMsgWindow, nsIMsgDBHdr *aMsgHdr,
                              nsIURI *aContentURI)
     : mMsgWindow(aMsgWindow), mMsgHdr(aMsgHdr), mContentURI(aContentURI)
   {}
 
   NS_IMETHOD Run()
--- a/mailnews/base/src/nsMsgPrintEngine.cpp
+++ b/mailnews/base/src/nsMsgPrintEngine.cpp
@@ -645,17 +645,17 @@ nsMsgPrintEngine::PrintMsgWindow()
   }
 }
 
 //---------------------------------------------------------------
 //-- Event Notification
 //---------------------------------------------------------------
 
 //---------------------------------------------------------------
-class nsPrintMsgWindowEvent : public nsRunnable
+class nsPrintMsgWindowEvent : public mozilla::Runnable
 {
 public:
   nsPrintMsgWindowEvent(nsMsgPrintEngine *mpe)
     : mMsgPrintEngine(mpe)
   {}
 
   NS_IMETHOD Run()
   {
@@ -664,17 +664,17 @@ public:
     return NS_OK;
   }
 
 private:
   RefPtr<nsMsgPrintEngine> mMsgPrintEngine;
 };
 
 //-----------------------------------------------------------
-class nsStartNextPrintOpEvent : public nsRunnable
+class nsStartNextPrintOpEvent : public mozilla::Runnable
 {
 public:
   nsStartNextPrintOpEvent(nsMsgPrintEngine *mpe)
     : mMsgPrintEngine(mpe)
   {}
 
   NS_IMETHOD Run()
   {
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@@ -1798,17 +1798,17 @@ nsresult nsMsgDBFolder::EndNewOfflineMes
 nsresult nsMsgDBFolder::CompactOfflineStore(nsIMsgWindow *inWindow, nsIUrlListener *aListener)
 {
   nsresult rv;
   nsCOMPtr <nsIMsgFolderCompactor> folderCompactor =  do_CreateInstance(NS_MSGOFFLINESTORECOMPACTOR_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   return folderCompactor->Compact(this, true, aListener, inWindow);
 }
 
-class AutoCompactEvent : public nsRunnable
+class AutoCompactEvent : public mozilla::Runnable
 {
 public:
   AutoCompactEvent(nsIMsgWindow *aMsgWindow, nsMsgDBFolder *aFolder)
     : mMsgWindow(aMsgWindow), mFolder(aFolder)
   {}
 
   NS_IMETHOD Run()
   {
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -1022,17 +1022,17 @@ void nsImapProtocol::ReleaseUrlState(boo
   if (saveFolderSink)
   {
     NS_ReleaseOnMainThread(mailnewsurl.forget());
     saveFolderSink = nullptr;
   }
 }
 
 
-class nsImapThreadShutdownEvent : public nsRunnable {
+class nsImapThreadShutdownEvent : public mozilla::Runnable {
 public:
   nsImapThreadShutdownEvent(nsIThread *thread) : mThread(thread) {
   }
   NS_IMETHOD Run() {
     mThread->Shutdown();
     return NS_OK;
   }
 private:
@@ -2009,17 +2009,17 @@ nsresult nsImapProtocol::SendData(const 
   // ProcessProtocolState - we override this only so we'll link - it should never get called.
 
 nsresult nsImapProtocol::ProcessProtocolState(nsIURI * url, nsIInputStream * inputStream,
                                               uint64_t sourceOffset, uint32_t length)
 {
   return NS_OK;
 }
 
-class UrlListenerNotifierEvent : public nsRunnable
+class UrlListenerNotifierEvent : public mozilla::Runnable
 {
 public:
   UrlListenerNotifierEvent(nsIMsgMailNewsUrl *aUrl, nsIImapProtocol *aProtocol)
     : mUrl(aUrl), mProtocol(aProtocol)
   {}
 
   NS_IMETHOD Run()
   {
--- a/mailnews/imap/src/nsSyncRunnableHelpers.cpp
+++ b/mailnews/imap/src/nsSyncRunnableHelpers.cpp
@@ -51,17 +51,17 @@ struct RefType<const nsACString&>
 };
 
 template<>
 struct RefType<const nsIID&>
 {
   typedef const nsIID& type;
 };
 
-class SyncRunnableBase : public nsRunnable
+class SyncRunnableBase : public mozilla::Runnable
 {
 public:
   nsresult Result() {
     return mResult;
   }
 
   mozilla::Monitor& Monitor() {
     return mMonitor;
--- a/mailnews/import/src/nsImportMail.cpp
+++ b/mailnews/import/src/nsImportMail.cpp
@@ -985,17 +985,17 @@ bool nsImportGenericMail::CreateFolder(n
 /**
  * These are the proxy objects we use to proxy nsIMsgFolder methods back
  * the the main thread. Since there are only five, we can hand roll them.
  * A better design might be a co-routine-ish design where the ui thread
  * hands off each folder to the import thread and when the thread finishes
  * the folder, the main thread hands it the next folder.
  */
 
-class GetSubFoldersRunnable : public nsRunnable
+class GetSubFoldersRunnable : public mozilla::Runnable
 {
 public:
   GetSubFoldersRunnable(nsIMsgFolder *aFolder);
   NS_DECL_NSIRUNNABLE
 private:
   nsCOMPtr<nsIMsgFolder> m_folder;
 };
 
@@ -1013,17 +1013,17 @@ NS_IMETHODIMP GetSubFoldersRunnable::Run
 
 nsresult ProxyGetSubFolders(nsIMsgFolder *aFolder)
 {
   RefPtr<GetSubFoldersRunnable> getSubFolders =
     new GetSubFoldersRunnable(aFolder);
   return NS_DispatchToMainThread(getSubFolders, NS_DISPATCH_SYNC);
 }
 
-class GetChildNamedRunnable : public nsRunnable
+class GetChildNamedRunnable : public mozilla::Runnable
 {
 public:
   GetChildNamedRunnable(nsIMsgFolder *aFolder, const nsAString& aName, nsIMsgFolder **aChild);
   NS_DECL_NSIRUNNABLE
 protected:
   nsCOMPtr<nsIMsgFolder> m_folder;
   nsString m_name;
   nsIMsgFolder **m_child;
@@ -1045,17 +1045,17 @@ NS_IMETHODIMP GetChildNamedRunnable::Run
 nsresult ProxyGetChildNamed(nsIMsgFolder *aFolder, const nsAString & aName,
                             nsIMsgFolder **aChild)
 {
   RefPtr<GetChildNamedRunnable> getChildNamed =
     new GetChildNamedRunnable(aFolder, aName, aChild);
   return NS_DispatchToMainThread(getChildNamed, NS_DISPATCH_SYNC);
 }
 
-class GetParentRunnable : public nsRunnable
+class GetParentRunnable : public mozilla::Runnable
 {
 public:
   GetParentRunnable(nsIMsgFolder *aFolder, nsIMsgFolder **aParent);
   NS_DECL_NSIRUNNABLE
 protected:
   nsCOMPtr<nsIMsgFolder> m_folder;
   nsIMsgFolder **m_parent;
 };
@@ -1073,17 +1073,17 @@ NS_IMETHODIMP GetParentRunnable::Run()
 
 nsresult ProxyGetParent(nsIMsgFolder *aFolder, nsIMsgFolder **aParent)
 {
   RefPtr<GetParentRunnable> getParent =
     new GetParentRunnable(aFolder, aParent);
   return NS_DispatchToMainThread(getParent, NS_DISPATCH_SYNC);
 }
 
-class ContainsChildNamedRunnable : public nsRunnable
+class ContainsChildNamedRunnable : public mozilla::Runnable
 {
 public:
   ContainsChildNamedRunnable(nsIMsgFolder *aFolder, const nsAString& aName, bool *aResult);
   NS_DECL_NSIRUNNABLE
 protected:
   nsCOMPtr<nsIMsgFolder> m_folder;
   nsString m_name;
   bool *m_result;
@@ -1106,17 +1106,17 @@ nsresult ProxyContainsChildNamed(nsIMsgF
                                  bool *aResult)
 {
   RefPtr<ContainsChildNamedRunnable> containsChildNamed =
     new ContainsChildNamedRunnable(aFolder, aName, aResult);
   return NS_DispatchToMainThread(containsChildNamed, NS_DISPATCH_SYNC);
 }
 
 
-class GenerateUniqueSubfolderNameRunnable : public nsRunnable
+class GenerateUniqueSubfolderNameRunnable : public mozilla::Runnable
 {
 public:
   GenerateUniqueSubfolderNameRunnable(nsIMsgFolder *aFolder,
                                       const nsAString& prefix,
                                       nsIMsgFolder *otherFolder,
                                       nsAString& name);
   NS_DECL_NSIRUNNABLE
 protected:
@@ -1145,17 +1145,17 @@ nsresult ProxyGenerateUniqueSubfolderNam
                                           nsAString& aName)
 
 {
   RefPtr<GenerateUniqueSubfolderNameRunnable> generateUniqueSubfolderName =
     new GenerateUniqueSubfolderNameRunnable(aFolder, aPrefix, aOtherFolder, aName);
   return NS_DispatchToMainThread(generateUniqueSubfolderName, NS_DISPATCH_SYNC);
 }
 
-class CreateSubfolderRunnable : public nsRunnable
+class CreateSubfolderRunnable : public mozilla::Runnable
 {
 public:
   CreateSubfolderRunnable(nsIMsgFolder *aFolder, const nsAString& aName);
   NS_DECL_NSIRUNNABLE
 protected:
   nsCOMPtr<nsIMsgFolder> m_folder;
   nsString m_name;
 };
@@ -1174,17 +1174,17 @@ NS_IMETHODIMP CreateSubfolderRunnable::R
 
 nsresult ProxyCreateSubfolder(nsIMsgFolder *aFolder, const nsAString &aName)
 {
   RefPtr<CreateSubfolderRunnable> createSubfolder =
     new CreateSubfolderRunnable(aFolder, aName);
   return NS_DispatchToMainThread(createSubfolder, NS_DISPATCH_SYNC);
 }
 
-class ForceDBClosedRunnable : public nsRunnable
+class ForceDBClosedRunnable : public mozilla::Runnable
 {
 public:
   ForceDBClosedRunnable(nsIMsgFolder *aFolder);
   NS_DECL_NSIRUNNABLE
 protected:
   nsCOMPtr<nsIMsgFolder> m_folder;
 };
 
--- a/mailnews/import/src/nsImportService.cpp
+++ b/mailnews/import/src/nsImportService.cpp
@@ -278,17 +278,17 @@ NS_IMETHODIMP nsImportService::GetModule
       else
         count++;
     }
   }
 
   return NS_ERROR_FAILURE;
 }
 
-class nsProxySendRunnable : public nsRunnable
+class nsProxySendRunnable : public mozilla::Runnable
 {
 public:
   nsProxySendRunnable(nsIMsgIdentity *aIdentity,
                        nsIMsgCompFields *aMsgFields,
                        const char *attachment1_type,
                        const nsACString &attachment1_body,
                        bool aIsDraft,
                        nsIArray *aLoadedAttachments,
--- a/mailnews/mime/src/mimecms.cpp
+++ b/mailnews/mime/src/mimecms.cpp
@@ -236,17 +236,17 @@ protected:
   int32_t mMimeNestingLevel;
 
   nsCString mFromAddr;
   nsCString mFromName;
   nsCString mSenderAddr;
   nsCString mSenderName;
 };
 
-class SignedStatusRunnable : public nsRunnable
+class SignedStatusRunnable : public mozilla::Runnable
 {
 public:
   SignedStatusRunnable(const nsMainThreadPtrHandle<nsIMsgSMIMEHeaderSink> &aSink, int32_t aNestingLevel,
                        int32_t aSignatureStatus, nsIX509Cert *aSignerCert);
   NS_DECL_NSIRUNNABLE
 protected:
   nsMainThreadPtrHandle<nsIMsgSMIMEHeaderSink> m_sink;
   int32_t m_nestingLevel;