corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1038207 - Fix various classes that reimplement nsISupports. r=ehsan

Browse Source
This commit is contained in:
Andrew McCreight
2014-07-14 12:21:34 -07:00
parent bf9347dcdd
commit a966f427cd
26 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsDocument.cpp
View File

@@ -11339,7 +11339,7 @@ public:
mDocument(do_GetWeakReference(aElement->OwnerDoc())),
mUserInputOrChromeCaller(aUserInputOrChromeCaller) {}
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSICONTENTPERMISSIONREQUEST
NS_IMETHOD Run()

8
content/canvas/src/ImageEncoder.cpp
View File

@@ -19,7 +19,7 @@ class EncodingCompleteEvent : public nsRunnable
virtual ~EncodingCompleteEvent() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
EncodingCompleteEvent(nsIGlobalObject* aGlobal,
nsIThread* aEncoderThread,
@@ -85,14 +85,14 @@ private:
bool mFailed;
};
NS_IMPL_ISUPPORTS(EncodingCompleteEvent, nsIRunnable);
NS_IMPL_ISUPPORTS_INHERITED0(EncodingCompleteEvent, nsRunnable);
class EncodingRunnable : public nsRunnable
{
virtual ~EncodingRunnable() {}
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
EncodingRunnable(const nsAString& aType,
const nsAString& aOptions,
@@ -180,7 +180,7 @@ private:
bool mUsingCustomOptions;
};
NS_IMPL_ISUPPORTS(EncodingRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS_INHERITED0(EncodingRunnable, nsRunnable);
/* static */
nsresult

4
content/media/MediaDecoderStateMachineScheduler.cpp
View File

@@ -14,7 +14,7 @@
namespace {
class TimerEvent : public nsITimerCallback, public nsRunnable {
typedef mozilla::MediaDecoderStateMachineScheduler Scheduler;
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
public:
TimerEvent(Scheduler* aScheduler, int aTimerId)
: mScheduler(aScheduler), mTimerId(aTimerId) {}
@@ -32,7 +32,7 @@ private:
const int mTimerId;
};
NS_IMPL_ISUPPORTS(TimerEvent, nsITimerCallback, nsIRunnable);
NS_IMPL_ISUPPORTS_INHERITED(TimerEvent, nsRunnable, nsITimerCallback);
} // anonymous namespace
static already_AddRefed<nsIEventTarget>

2
dom/events/FocusEvent.h
View File

@@ -17,7 +17,7 @@ class FocusEvent : public UIEvent,
public nsIDOMFocusEvent
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOMFOCUSEVENT
// Forward to base class

7
dom/src/notification/DesktopNotification.cpp
View File

@@ -34,7 +34,7 @@ class DesktopNotificationRequest : public nsIContentPermissionRequest,
}
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSICONTENTPERMISSIONREQUEST
DesktopNotificationRequest(DesktopNotification* notification)
@@ -309,9 +309,8 @@ DesktopNotificationCenter::WrapObject(JSContext* aCx)
/* DesktopNotificationRequest */
/* ------------------------------------------------------------------------ */
NS_IMPL_ISUPPORTS(DesktopNotificationRequest,
nsIContentPermissionRequest,
nsIRunnable)
NS_IMPL_ISUPPORTS_INHERITED(DesktopNotificationRequest, nsRunnable,
nsIContentPermissionRequest)
NS_IMETHODIMP
DesktopNotificationRequest::GetPrincipal(nsIPrincipal * *aRequestingPrincipal)

8
gfx/thebes/gfxFontInfoLoader.cpp
View File

@@ -29,7 +29,7 @@ FontInfoData::Load()
class FontInfoLoadCompleteEvent : public nsRunnable {
virtual ~FontInfoLoadCompleteEvent() {}
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
FontInfoLoadCompleteEvent(FontInfoData *aFontInfo) :
mFontInfo(aFontInfo)
@@ -43,7 +43,7 @@ class FontInfoLoadCompleteEvent : public nsRunnable {
class AsyncFontInfoLoader : public nsRunnable {
virtual ~AsyncFontInfoLoader() {}
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
AsyncFontInfoLoader(FontInfoData *aFontInfo) :
mFontInfo(aFontInfo)
@@ -70,7 +70,7 @@ FontInfoLoadCompleteEvent::Run()
return NS_OK;
}
NS_IMPL_ISUPPORTS(FontInfoLoadCompleteEvent, nsIRunnable);
NS_IMPL_ISUPPORTS_INHERITED0(FontInfoLoadCompleteEvent, nsRunnable);
// runs on separate thread
nsresult
@@ -86,7 +86,7 @@ AsyncFontInfoLoader::Run()
return NS_OK;
}
NS_IMPL_ISUPPORTS(AsyncFontInfoLoader, nsIRunnable);
NS_IMPL_ISUPPORTS_INHERITED0(AsyncFontInfoLoader, nsRunnable);
NS_IMPL_ISUPPORTS(gfxFontInfoLoader::ShutdownObserver, nsIObserver)

2
image/src/ClippedImage.cpp
View File

@@ -156,7 +156,7 @@ ClippedImage::ShouldClip()
return mShouldClip.ref();
}
NS_IMPL_ISUPPORTS(ClippedImage, imgIContainer)
NS_IMPL_ISUPPORTS_INHERITED0(ClippedImage, ImageWrapper)
nsIntRect
ClippedImage::FrameRect(uint32_t aWhichFrame)

2
image/src/ClippedImage.h
View File

@@ -29,7 +29,7 @@ class ClippedImage : public ImageWrapper
typedef mozilla::gfx::SourceSurface SourceSurface;
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;

2
image/src/FrozenImage.cpp
View File

@@ -10,7 +10,7 @@ using namespace mozilla::gfx;
namespace mozilla {
namespace image {
NS_IMPL_ISUPPORTS(FrozenImage, imgIContainer)
NS_IMPL_ISUPPORTS_INHERITED0(FrozenImage, ImageWrapper)
nsIntRect
FrozenImage::FrameRect(uint32_t /* aWhichFrame - ignored */)

2
image/src/FrozenImage.h
View File

@@ -29,7 +29,7 @@ class FrozenImage : public ImageWrapper
typedef mozilla::gfx::SourceSurface SourceSurface;
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;
virtual void IncrementAnimationConsumers() MOZ_OVERRIDE;

2
image/src/OrientedImage.cpp
View File

@@ -20,7 +20,7 @@ using mozilla::layers::ImageContainer;
namespace mozilla {
namespace image {
NS_IMPL_ISUPPORTS(OrientedImage, imgIContainer)
NS_IMPL_ISUPPORTS_INHERITED0(OrientedImage, ImageWrapper)
nsIntRect
OrientedImage::FrameRect(uint32_t aWhichFrame)

2
image/src/OrientedImage.h
View File

@@ -26,7 +26,7 @@ class OrientedImage : public ImageWrapper
typedef mozilla::gfx::SourceSurface SourceSurface;
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;

2
intl/lwbrk/src/nsSemanticUnitScanner.cpp
View File

@@ -5,7 +5,7 @@
#include "nsSemanticUnitScanner.h"
NS_IMPL_ISUPPORTS(nsSemanticUnitScanner, nsISemanticUnitScanner)
NS_IMPL_ISUPPORTS_INHERITED(nsSemanticUnitScanner, nsSampleWordBreaker, nsISemanticUnitScanner)
nsSemanticUnitScanner::nsSemanticUnitScanner() : nsSampleWordBreaker()
{

2
intl/lwbrk/src/nsSemanticUnitScanner.h
View File

@@ -14,7 +14,7 @@ class nsSemanticUnitScanner : public nsISemanticUnitScanner
, public nsSampleWordBreaker
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSISEMANTICUNITSCANNER
nsSemanticUnitScanner();

2
js/xpconnect/src/xpcprivate.h
View File

@@ -2855,7 +2855,7 @@ class nsXPCComponents : public nsXPCComponentsBase,
public nsIXPCComponents
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIXPCCOMPONENTSBASE(nsXPCComponentsBase::)
NS_DECL_NSIXPCCOMPONENTS

2
layout/printing/nsPagePrintTimer.h
View File

@@ -23,7 +23,7 @@ class nsPagePrintTimer MOZ_FINAL : public nsRunnable,
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
nsPagePrintTimer(nsPrintEngine* aPrintEngine,
nsIDocumentViewerPrint* aDocViewerPrint,

2
layout/svg/nsSVGEffects.h
View File

@@ -178,7 +178,7 @@ public:
nsSVGFilterFrame *GetFilterFrame();
// nsISupports
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
// nsISVGFilterReference
virtual void Invalidate() MOZ_OVERRIDE { DoUpdate(); };

2
modules/libjar/nsJARChannel.h
View File

@@ -39,7 +39,7 @@ class nsJARChannel : public nsIJARChannel
, public nsHashPropertyBag
{
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIREQUEST
NS_DECL_NSICHANNEL
NS_DECL_NSIJARCHANNEL

4
netwerk/cache/nsCacheEntryDescriptor.h vendored
View File

@@ -117,7 +117,7 @@ private:
bool mStreamInitialized;
bool mStreamEnded;
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
nsDecompressInputStreamWrapper(nsCacheEntryDescriptor * desc,
uint32_t off)
@@ -197,7 +197,7 @@ private:
bool mStreamEnded;
uint32_t mUncompressedCount;
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
nsCompressOutputStreamWrapper(nsCacheEntryDescriptor * desc,
uint32_t off)

4
netwerk/protocol/app/AppProtocolHandler.cpp
View File

@@ -22,7 +22,7 @@ class DummyChannel : public nsIJARChannel
, nsRunnable
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIREQUEST
NS_DECL_NSICHANNEL
NS_DECL_NSIJARCHANNEL
@@ -43,7 +43,7 @@ private:
nsCOMPtr<nsILoadInfo> mLoadInfo;
};
NS_IMPL_ISUPPORTS(DummyChannel, nsIRequest, nsIChannel, nsIJARChannel)
NS_IMPL_ISUPPORTS_INHERITED(DummyChannel, nsRunnable, nsIRequest, nsIChannel, nsIJARChannel)
DummyChannel::DummyChannel() : mPending(false)
, mSuspendCount(0)

2
storage/test/test_AsXXX_helpers.cpp
View File

@@ -17,7 +17,7 @@
class Spinner : public AsyncStatementSpinner
{
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_ASYNCSTATEMENTSPINNER
Spinner() {}
protected:

4
toolkit/components/places/Helpers.cpp
View File

@@ -370,9 +370,9 @@ PlacesEvent::Notify()
}
}
NS_IMPL_ISUPPORTS(
NS_IMPL_ISUPPORTS_INHERITED0(
PlacesEvent
, nsIRunnable
, nsRunnable
)
////////////////////////////////////////////////////////////////////////////////

2
toolkit/components/places/Helpers.h
View File

@@ -216,7 +216,7 @@ bool GetHiddenState(bool aIsRedirect,
class PlacesEvent : public nsRunnable
{
public:
NS_DECL_THREADSAFE_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIRUNNABLE
PlacesEvent(const char* aTopic);

2
uriloader/exthandler/ExternalHelperAppParent.h
View File

@@ -40,7 +40,7 @@ class ExternalHelperAppParent : public PExternalHelperAppParent
typedef mozilla::ipc::OptionalURIParams OptionalURIParams;
public:
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIREQUEST
NS_DECL_NSICHANNEL
NS_DECL_NSIMULTIPARTCHANNEL

2
widget/cocoa/nsStandaloneNativeMenu.h
View File

@@ -15,7 +15,7 @@ class nsStandaloneNativeMenu : public nsMenuGroupOwnerX, public nsIStandaloneNat
public:
nsStandaloneNativeMenu();
NS_DECL_ISUPPORTS
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSISTANDALONENATIVEMENU
// nsMenuObjectX

3
widget/cocoa/nsStandaloneNativeMenu.mm
View File

@@ -13,7 +13,8 @@
#include "nsObjCExceptions.h"
NS_IMPL_ISUPPORTS(nsStandaloneNativeMenu, nsIMutationObserver, nsIStandaloneNativeMenu)
NS_IMPL_ISUPPORTS_INHERITED(nsStandaloneNativeMenu, nsMenuGroupOwnerX,
nsIMutationObserver, nsIStandaloneNativeMenu)
nsStandaloneNativeMenu::nsStandaloneNativeMenu()
: mMenu(nullptr)