Bug 1181324 - Eliminate the duplicate mRefCnt member in MultipartImage. r=seth
authorMichael Layzell <michael@thelayzells.com>
Tue, 07 Jul 2015 14:10:00 +0200
changeset 251904 9ef460929d4e4d7f5025ab6c513cfb10e62fc7e3
parent 251903 596ee431b3d25c957fa8389a75f9f36787e2d33e
child 251905 4ed2ded0daef3af9234ff96ce241c1b19a026818
push id29017
push userryanvm@gmail.com
push dateWed, 08 Jul 2015 18:33:30 +0000
treeherdermozilla-central@803a6e097827 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersseth
bugs1181324
milestone42.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 1181324 - Eliminate the duplicate mRefCnt member in MultipartImage. r=seth
image/MultipartImage.cpp
image/MultipartImage.h
--- a/image/MultipartImage.cpp
+++ b/image/MultipartImage.cpp
@@ -126,18 +126,18 @@ MultipartImage::Init()
 
 MultipartImage::~MultipartImage()
 {
   // Ask our ProgressTracker to drop its weak reference to us.
   mTracker->ResetImage();
 }
 
 NS_IMPL_QUERY_INTERFACE_INHERITED0(MultipartImage, ImageWrapper)
-NS_IMPL_ADDREF(MultipartImage)
-NS_IMPL_RELEASE(MultipartImage)
+NS_IMPL_ADDREF_INHERITED(MultipartImage, ImageWrapper)
+NS_IMPL_RELEASE_INHERITED(MultipartImage, ImageWrapper)
 
 void
 MultipartImage::BeginTransitionToPart(Image* aNextPart)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aNextPart);
 
   if (mNextPart) {
--- a/image/MultipartImage.h
+++ b/image/MultipartImage.h
@@ -20,17 +20,17 @@ class NextPartObserver;
  * images.
  */
 class MultipartImage
   : public ImageWrapper
   , public IProgressObserver
 {
 public:
   MOZ_DECLARE_REFCOUNTED_TYPENAME(MultipartImage)
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
 
   void BeginTransitionToPart(Image* aNextPart);
 
   // Overridden ImageWrapper methods:
   virtual already_AddRefed<imgIContainer> Unwrap() override;
   virtual already_AddRefed<ProgressTracker> GetProgressTracker() override;
   virtual void SetProgressTracker(ProgressTracker* aTracker) override;
   virtual nsresult OnImageDataAvailable(nsIRequest* aRequest,