Backed out changeset 1204d2bb361b (bug 870887) for build bustage on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 28 May 2013 14:13:22 -0400
changeset 15676 81898db42ab6db28f137c5ee79b108916303db2a
parent 15675 9dd77be8db55cc89ab4c2ad40f7cfc2ec02a339b
child 15677 3ac3e87c62d51b6e5abe4f6524741a20f4a2bc0e
push id942
push userbugzilla@standard8.plus.com
push dateMon, 05 Aug 2013 19:15:38 +0000
treeherdercomm-beta@0e1a1c4a9f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs870887
backs out1204d2bb361b4a919d3cf76f27e225186000438e
Backed out changeset 1204d2bb361b (bug 870887) for build bustage on a CLOSED TREE.
calendar/base/backend/libical/calICSService.h
--- a/calendar/base/backend/libical/calICSService.h
+++ b/calendar/base/backend/libical/calICSService.h
@@ -3,17 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #if !defined(INCLUDED_CALICSSERVICE_H)
 #define INCLUDED_CALICSSERVICE_H
 
 #include "nsCOMPtr.h"
 #include "calIICSService.h"
 #include "calITimezoneProvider.h"
 #include "nsInterfaceHashtable.h"
-#include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 #include "calUtils.h"
 
 extern "C" {
 #include "ical.h"
 }
 
 class calICSService : public calIICSService,
@@ -23,46 +22,45 @@ class calICSService : public calIICSServ
 protected:
     class ParserWorker : public nsRunnable {
     public:
       ParserWorker(nsIThread *mainThread,
                    nsIThread *workerThread,
                    const nsACString &icsString,
                    calITimezoneProvider *tzProvider,
                    calIIcsComponentParsingListener *listener) :
-        mString(icsString), mProvider(tzProvider),
+        mString(icsString), mProvider(tzProvider), mListener(listener),
         mMainThread(mainThread), mWorkerThread(workerThread)
       {
-        mListener = new nsMainThreadPtrHolder(listener);
       }
 
       NS_DECL_NSIRUNNABLE
 
     protected:
       nsCString mString;
       nsCOMPtr<calITimezoneProvider> mProvider;
-      nsMainThreadPtrHandle<calIIcsComponentParsingListener> mListener;
+      nsCOMPtr<calIIcsComponentParsingListener> mListener;
       nsCOMPtr<nsIThread> mMainThread;
       nsCOMPtr<nsIThread> mWorkerThread;
 
       class ParserWorkerCompleter : public nsRunnable {
       public:
         ParserWorkerCompleter(nsIThread *workerThread,
                               nsresult status,
                               calIIcalComponent *component,
-                              const nsMainThreadPtrHandle<calIIcsComponentParsingListener> &listener) :
+                              calIIcsComponentParsingListener *listener) :
           mListener(listener), mComp(component),
           mStatus(status), mWorkerThread(workerThread)
         {
         }
 
         NS_DECL_NSIRUNNABLE
       protected:
         nsCOMPtr<nsIThread> mWorkerThread;
-        nsMainThreadPtrHandle<calIIcsComponentParsingListener> mListener;
+        nsCOMPtr<calIIcsComponentParsingListener> mListener;
         nsCOMPtr<calIIcalComponent> mComp;
         nsresult mStatus;
       };
     };
 public:
     calICSService();
 
     NS_DECL_ISUPPORTS