From c73561b313101af59a8408b0aacc04af282c770a Mon Sep 17 00:00:00 2001 From: Michael Layzell Date: Tue, 7 Jul 2015 14:10:00 +0200 Subject: [PATCH] Bug 1181324 - Eliminate the duplicate mRefCnt member in MultipartImage. r=seth --HG-- extra : rebase_source : 0edc7d46f8a3a15f2aeea4e51f69301d605320b5 --- image/MultipartImage.cpp | 4 ++-- image/MultipartImage.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image/MultipartImage.cpp b/image/MultipartImage.cpp index 387d5953f2d9..9ffde65d55aa 100644 --- a/image/MultipartImage.cpp +++ b/image/MultipartImage.cpp @@ -131,8 +131,8 @@ MultipartImage::~MultipartImage() } 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) diff --git a/image/MultipartImage.h b/image/MultipartImage.h index 95fce0ce0a70..b041e7213530 100644 --- a/image/MultipartImage.h +++ b/image/MultipartImage.h @@ -25,7 +25,7 @@ class MultipartImage { public: MOZ_DECLARE_REFCOUNTED_TYPENAME(MultipartImage) - NS_DECL_ISUPPORTS + NS_DECL_ISUPPORTS_INHERITED void BeginTransitionToPart(Image* aNextPart);