Commit 76606ba9 authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1401379 - Part 7: Make nsBrowserStatusFilter cycle collected, r=smaug 

MozReview-Commit-ID: AsyFAgKJkxq
parent c2a98926

toolkit/components/statusfilter/nsBrowserStatusFilter.cpp

+14 −5
Original line number Diff line number Diff line
@@ -42,11 +42,20 @@ nsBrowserStatusFilter::~nsBrowserStatusFilter() 
// nsBrowserStatusFilter::nsISupports

//-----------------------------------------------------------------------------



NS_IMPL_ISUPPORTS(nsBrowserStatusFilter,

                  nsIWebProgress,

                  nsIWebProgressListener,

                  nsIWebProgressListener2,

                  nsISupportsWeakReference)

NS_IMPL_CYCLE_COLLECTION(nsBrowserStatusFilter,

                         mListener,

                         mTarget)



NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsBrowserStatusFilter)

  NS_INTERFACE_MAP_ENTRY(nsIWebProgress)

  NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)

  NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener2)

  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)

  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIWebProgress)

NS_INTERFACE_MAP_END



NS_IMPL_CYCLE_COLLECTING_ADDREF(nsBrowserStatusFilter)

NS_IMPL_CYCLE_COLLECTING_RELEASE(nsBrowserStatusFilter)



//-----------------------------------------------------------------------------

// nsBrowserStatusFilter::nsIWebProgress

toolkit/components/statusfilter/nsBrowserStatusFilter.h

+3 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "nsIWebProgressListener2.h"

#include "nsIWebProgress.h"

#include "nsWeakReference.h"

#include "nsCycleCollectionParticipant.h"

#include "nsITimer.h"

#include "nsCOMPtr.h"

#include "nsString.h"
@@ -26,7 +27,8 @@ class nsBrowserStatusFilter : public nsIWebProgress 
public:

    nsBrowserStatusFilter();



    NS_DECL_ISUPPORTS

    NS_DECL_CYCLE_COLLECTING_ISUPPORTS

    NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsBrowserStatusFilter, nsIWebProgress)

    NS_DECL_NSIWEBPROGRESS

    NS_DECL_NSIWEBPROGRESSLISTENER

    NS_DECL_NSIWEBPROGRESSLISTENER2