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

Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan

Browse Source
This commit is contained in:
Joshua Cranmer
2012-07-06 13:15:45 -05:00
parent b5ce02aa3f
commit 68b27cf092
78 changed files with 644 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
chrome/src/nsChromeRegistryChrome.h
View File

@@ -22,24 +22,24 @@ class nsChromeRegistryChrome : public nsChromeRegistry
nsChromeRegistryChrome(); nsChromeRegistryChrome();
~nsChromeRegistryChrome(); ~nsChromeRegistryChrome();
NS_OVERRIDE nsresult Init(); nsresult Init() MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD CheckForNewChrome(); NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD CheckForOSAccessibility(); NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
nsIUTF8StringEnumerator* *aResult); nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD IsLocaleRTL(const nsACString& package, NS_IMETHOD IsLocaleRTL(const nsACString& package,
bool *aResult); bool *aResult) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, NS_IMETHOD GetSelectedLocale(const nsACString& aPackage,
nsACString& aLocale); nsACString& aLocale) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic,
const PRUnichar *someData); const PRUnichar *someData) MOZ_OVERRIDE;
#ifdef MOZ_XUL #ifdef MOZ_XUL
NS_OVERRIDE NS_IMETHOD GetXULOverlays(nsIURI *aURI, NS_IMETHOD GetXULOverlays(nsIURI *aURI,
nsISimpleEnumerator **_retval); nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetStyleOverlays(nsIURI *aURI, NS_IMETHOD GetStyleOverlays(nsIURI *aURI,
nsISimpleEnumerator **_retval); nsISimpleEnumerator **_retval) MOZ_OVERRIDE;
#endif #endif
void SendRegisteredChrome(mozilla::dom::PContentParent* aChild); void SendRegisteredChrome(mozilla::dom::PContentParent* aChild);
@@ -50,12 +50,12 @@ class nsChromeRegistryChrome : public nsChromeRegistry
PRUint32 number, void *arg); PRUint32 number, void *arg);
nsresult SelectLocaleFromPref(nsIPrefBranch* prefs); nsresult SelectLocaleFromPref(nsIPrefBranch* prefs);
NS_OVERRIDE nsresult UpdateSelectedLocale(); nsresult UpdateSelectedLocale() MOZ_OVERRIDE;
NS_OVERRIDE nsIURI* GetBaseURIFromPackage(const nsCString& aPackage, nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
const nsCString& aProvider, const nsCString& aProvider,
const nsCString& aPath); const nsCString& aPath) MOZ_OVERRIDE;
NS_OVERRIDE nsresult GetFlagsFromPackage(const nsCString& aPackage, nsresult GetFlagsFromPackage(const nsCString& aPackage,
PRUint32* aFlags); PRUint32* aFlags) MOZ_OVERRIDE;
static const PLDHashTableOps kTableOps; static const PLDHashTableOps kTableOps;
static PLDHashNumber HashKey(PLDHashTable *table, const void *key); static PLDHashNumber HashKey(PLDHashTable *table, const void *key);

36
chrome/src/nsChromeRegistryContent.h
View File

@@ -25,20 +25,20 @@ class nsChromeRegistryContent : public nsChromeRegistry
const nsTArray<OverrideMapping>& aOverrides, const nsTArray<OverrideMapping>& aOverrides,
const nsACString& aLocale); const nsACString& aLocale);
NS_OVERRIDE NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage, NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
nsIUTF8StringEnumerator* *aResult); nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD CheckForNewChrome(); NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD CheckForOSAccessibility(); NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
const PRUnichar* aData); const PRUnichar* aData) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD IsLocaleRTL(const nsACString& package, NS_IMETHOD IsLocaleRTL(const nsACString& package,
bool *aResult); bool *aResult) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, NS_IMETHOD GetSelectedLocale(const nsACString& aPackage,
nsACString& aLocale); nsACString& aLocale) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetStyleOverlays(nsIURI *aChromeURL, NS_IMETHOD GetStyleOverlays(nsIURI *aChromeURL,
nsISimpleEnumerator **aResult); nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
NS_OVERRIDE NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL, NS_IMETHOD GetXULOverlays(nsIURI *aChromeURL,
nsISimpleEnumerator **aResult); nsISimpleEnumerator **aResult) MOZ_OVERRIDE;
private: private:
struct PackageEntry struct PackageEntry
@@ -56,11 +56,11 @@ class nsChromeRegistryContent : public nsChromeRegistry
void RegisterResource(const ResourceMapping& aResource); void RegisterResource(const ResourceMapping& aResource);
void RegisterOverride(const OverrideMapping& aOverride); void RegisterOverride(const OverrideMapping& aOverride);
NS_OVERRIDE nsresult UpdateSelectedLocale(); nsresult UpdateSelectedLocale() MOZ_OVERRIDE;
NS_OVERRIDE nsIURI* GetBaseURIFromPackage(const nsCString& aPackage, nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
const nsCString& aProvider, const nsCString& aProvider,
const nsCString& aPath); const nsCString& aPath) MOZ_OVERRIDE;
NS_OVERRIDE nsresult GetFlagsFromPackage(const nsCString& aPackage, PRUint32* aFlags); nsresult GetFlagsFromPackage(const nsCString& aPackage, PRUint32* aFlags) MOZ_OVERRIDE;
nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash; nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;
nsCString mLocale; nsCString mLocale;

26
content/smil/nsSMILCSSValueType.h
View File

@@ -10,7 +10,7 @@
#include "nsISMILType.h" #include "nsISMILType.h"
#include "nsCSSProperty.h" #include "nsCSSProperty.h"
#include "nscore.h" // For NS_OVERRIDE #include "mozilla/Attributes.h"
class nsAString; class nsAString;
@@ -34,22 +34,22 @@ public:
protected: protected:
// nsISMILType Methods // nsISMILType Methods
// ------------------- // -------------------
NS_OVERRIDE virtual void Init(nsSMILValue& aValue) const; virtual void Init(nsSMILValue& aValue) const MOZ_OVERRIDE;
NS_OVERRIDE virtual void Destroy(nsSMILValue&) const; virtual void Destroy(nsSMILValue&) const MOZ_OVERRIDE;
NS_OVERRIDE virtual nsresult Assign(nsSMILValue& aDest, virtual nsresult Assign(nsSMILValue& aDest,
const nsSMILValue& aSrc) const; const nsSMILValue& aSrc) const MOZ_OVERRIDE;
NS_OVERRIDE virtual bool IsEqual(const nsSMILValue& aLeft, virtual bool IsEqual(const nsSMILValue& aLeft,
const nsSMILValue& aRight) const; const nsSMILValue& aRight) const MOZ_OVERRIDE;
NS_OVERRIDE virtual nsresult Add(nsSMILValue& aDest, virtual nsresult Add(nsSMILValue& aDest,
const nsSMILValue& aValueToAdd, const nsSMILValue& aValueToAdd,
PRUint32 aCount) const; PRUint32 aCount) const MOZ_OVERRIDE;
NS_OVERRIDE virtual nsresult ComputeDistance(const nsSMILValue& aFrom, virtual nsresult ComputeDistance(const nsSMILValue& aFrom,
const nsSMILValue& aTo, const nsSMILValue& aTo,
double& aDistance) const; double& aDistance) const MOZ_OVERRIDE;
NS_OVERRIDE virtual nsresult Interpolate(const nsSMILValue& aStartVal, virtual nsresult Interpolate(const nsSMILValue& aStartVal,
const nsSMILValue& aEndVal, const nsSMILValue& aEndVal,
double aUnitDistance, double aUnitDistance,
nsSMILValue& aResult) const; nsSMILValue& aResult) const MOZ_OVERRIDE;
public: public:
// Helper Methods // Helper Methods

16
content/smil/nsSMILSetAnimationFunction.h
View File

@@ -39,26 +39,26 @@ public:
* @returns true if aAttribute is a recognized animation-related * @returns true if aAttribute is a recognized animation-related
* attribute; false otherwise. * attribute; false otherwise.
*/ */
NS_OVERRIDE virtual bool UnsetAttr(nsIAtom* aAttribute); virtual bool UnsetAttr(nsIAtom* aAttribute) MOZ_OVERRIDE;
protected: protected:
// Although <set> animation might look like to-animation, unlike to-animation, // Although <set> animation might look like to-animation, unlike to-animation,
// it never interpolates values. // it never interpolates values.
// Returning false here will mean this animation function gets treated as // Returning false here will mean this animation function gets treated as
// a single-valued function and no interpolation will be attempted. // a single-valued function and no interpolation will be attempted.
NS_OVERRIDE virtual bool IsToAnimation() const { virtual bool IsToAnimation() const MOZ_OVERRIDE {
return false; return false;
} }
// <set> applies the exact same value across the simple duration. // <set> applies the exact same value across the simple duration.
NS_OVERRIDE virtual bool IsValueFixedForSimpleDuration() const { virtual bool IsValueFixedForSimpleDuration() const MOZ_OVERRIDE {
return true; return true;
} }
NS_OVERRIDE virtual bool HasAttr(nsIAtom* aAttName) const; virtual bool HasAttr(nsIAtom* aAttName) const MOZ_OVERRIDE;
NS_OVERRIDE virtual const nsAttrValue* GetAttr(nsIAtom* aAttName) const; virtual const nsAttrValue* GetAttr(nsIAtom* aAttName) const MOZ_OVERRIDE;
NS_OVERRIDE virtual bool GetAttr(nsIAtom* aAttName, virtual bool GetAttr(nsIAtom* aAttName,
nsAString& aResult) const; nsAString& aResult) const MOZ_OVERRIDE;
NS_OVERRIDE virtual bool WillReplace() const; virtual bool WillReplace() const MOZ_OVERRIDE;
bool IsDisallowedAttribute(const nsIAtom* aAttribute) const; bool IsDisallowedAttribute(const nsIAtom* aAttribute) const;
}; };

16
content/svg/content/src/SVGMotionSMILAnimationFunction.h
View File

@@ -31,11 +31,11 @@ class SVGMotionSMILAnimationFunction : public nsSMILAnimationFunction
{ {
public: public:
SVGMotionSMILAnimationFunction(); SVGMotionSMILAnimationFunction();
NS_OVERRIDE virtual bool SetAttr(nsIAtom* aAttribute, virtual bool SetAttr(nsIAtom* aAttribute,
const nsAString& aValue, const nsAString& aValue,
nsAttrValue& aResult, nsAttrValue& aResult,
nsresult* aParseResult = nsnull); nsresult* aParseResult = nsnull) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool UnsetAttr(nsIAtom* aAttribute); virtual bool UnsetAttr(nsIAtom* aAttribute) MOZ_OVERRIDE;
// Method to allow our owner-element to signal us when our <mpath> // Method to allow our owner-element to signal us when our <mpath>
// has changed or been added/removed. When that happens, we need to // has changed or been added/removed. When that happens, we need to
@@ -56,12 +56,12 @@ protected:
ePathSourceType_Mpath ePathSourceType_Mpath
}; };
NS_OVERRIDE virtual nsSMILCalcMode GetCalcMode() const; virtual nsSMILCalcMode GetCalcMode() const MOZ_OVERRIDE;
NS_OVERRIDE virtual nsresult GetValues(const nsISMILAttr& aSMILAttr, virtual nsresult GetValues(const nsISMILAttr& aSMILAttr,
nsSMILValueArray& aResult); nsSMILValueArray& aResult) MOZ_OVERRIDE;
NS_OVERRIDE virtual void CheckValueListDependentAttrs(PRUint32 aNumValues); virtual void CheckValueListDependentAttrs(PRUint32 aNumValues) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool IsToAnimation() const; virtual bool IsToAnimation() const MOZ_OVERRIDE;
void CheckKeyPoints(); void CheckKeyPoints();
nsresult SetKeyPoints(const nsAString& aKeyPoints, nsAttrValue& aResult); nsresult SetKeyPoints(const nsAString& aKeyPoints, nsAttrValue& aResult);

4
dom/ipc/ContentChild.h
View File

@@ -76,8 +76,8 @@ public:
virtual bool virtual bool
DeallocPCrashReporter(PCrashReporterChild*); DeallocPCrashReporter(PCrashReporterChild*);
NS_OVERRIDE virtual PHalChild* AllocPHal(); virtual PHalChild* AllocPHal() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool DeallocPHal(PHalChild*); virtual bool DeallocPHal(PHalChild*) MOZ_OVERRIDE;
virtual PIndexedDBChild* AllocPIndexedDB(); virtual PIndexedDBChild* AllocPIndexedDB();
virtual bool DeallocPIndexedDB(PIndexedDBChild* aActor); virtual bool DeallocPIndexedDB(PIndexedDBChild* aActor);

4
dom/ipc/ContentParent.h
View File

@@ -146,8 +146,8 @@ private:
const NativeThreadId& tid, const NativeThreadId& tid,
const PRUint32& processType); const PRUint32& processType);
NS_OVERRIDE virtual PHalParent* AllocPHal(); virtual PHalParent* AllocPHal() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool DeallocPHal(PHalParent*); virtual bool DeallocPHal(PHalParent*) MOZ_OVERRIDE;
virtual PIndexedDBParent* AllocPIndexedDB(); virtual PIndexedDBParent* AllocPIndexedDB();

6
dom/ipc/ContentProcess.h
View File

@@ -33,10 +33,8 @@ public:
~ContentProcess() ~ContentProcess()
{ } { }
NS_OVERRIDE virtual bool Init() MOZ_OVERRIDE;
virtual bool Init(); virtual void CleanUp() MOZ_OVERRIDE;
NS_OVERRIDE
virtual void CleanUp();
private: private:
ContentChild mContent; ContentChild mContent;

9
dom/ipc/TabChild.h
View File

@@ -259,15 +259,12 @@ public:
bool IsAsyncPanZoomEnabled(); bool IsAsyncPanZoomEnabled();
protected: protected:
NS_OVERRIDE
virtual PRenderFrameChild* AllocPRenderFrame(ScrollingBehavior* aScrolling, virtual PRenderFrameChild* AllocPRenderFrame(ScrollingBehavior* aScrolling,
LayersBackend* aBackend, LayersBackend* aBackend,
int32_t* aMaxTextureSize, int32_t* aMaxTextureSize,
uint64_t* aLayersId); uint64_t* aLayersId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool DeallocPRenderFrame(PRenderFrameChild* aFrame) MOZ_OVERRIDE;
virtual bool DeallocPRenderFrame(PRenderFrameChild* aFrame); virtual bool RecvDestroy() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvDestroy();
nsEventStatus DispatchWidgetEvent(nsGUIEvent& event); nsEventStatus DispatchWidgetEvent(nsGUIEvent& event);

6
dom/ipc/TabParent.h
View File

@@ -212,13 +212,11 @@ protected:
bool ShouldDelayDialogs(); bool ShouldDelayDialogs();
bool AllowContentIME(); bool AllowContentIME();
NS_OVERRIDE
virtual PRenderFrameParent* AllocPRenderFrame(ScrollingBehavior* aScrolling, virtual PRenderFrameParent* AllocPRenderFrame(ScrollingBehavior* aScrolling,
LayersBackend* aBackend, LayersBackend* aBackend,
int32_t* aMaxTextureSize, int32_t* aMaxTextureSize,
uint64_t* aLayersId); uint64_t* aLayersId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool DeallocPRenderFrame(PRenderFrameParent* aFrame) MOZ_OVERRIDE;
virtual bool DeallocPRenderFrame(PRenderFrameParent* aFrame);
// IME // IME
static TabParent *mIMETabParent; static TabParent *mIMETabParent;

11
dom/plugins/base/PluginPRLibrary.h
View File

@@ -112,18 +112,15 @@ public:
virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window); virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window);
virtual nsresult GetImageContainer(NPP instance, ImageContainer** aContainer); virtual nsresult GetImageContainer(NPP instance, ImageContainer** aContainer);
virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize); virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize);
NS_OVERRIDE virtual bool UseAsyncPainting() { return false; } virtual bool UseAsyncPainting() MOZ_OVERRIDE { return false; }
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
virtual nsresult IsRemoteDrawingCoreAnimation(NPP instance, bool *aDrawing); virtual nsresult IsRemoteDrawingCoreAnimation(NPP instance, bool *aDrawing);
#endif #endif
NS_OVERRIDE virtual nsresult SetBackgroundUnknown(NPP instance) MOZ_OVERRIDE;
virtual nsresult SetBackgroundUnknown(NPP instance);
NS_OVERRIDE
virtual nsresult BeginUpdateBackground(NPP instance, virtual nsresult BeginUpdateBackground(NPP instance,
const nsIntRect&, gfxContext** aCtx); const nsIntRect&, gfxContext** aCtx) MOZ_OVERRIDE;
NS_OVERRIDE
virtual nsresult EndUpdateBackground(NPP instance, virtual nsresult EndUpdateBackground(NPP instance,
gfxContext* aCtx, const nsIntRect&); gfxContext* aCtx, const nsIntRect&) MOZ_OVERRIDE;
#if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6) #if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
virtual nsresult HandleGUIEvent(NPP instance, virtual nsresult HandleGUIEvent(NPP instance,
const nsGUIEvent& anEvent, bool* handled); const nsGUIEvent& anEvent, bool* handled);

2
dom/plugins/ipc/BrowserStreamChild.h
View File

@@ -30,7 +30,7 @@ public:
uint16_t* stype); uint16_t* stype);
virtual ~BrowserStreamChild(); virtual ~BrowserStreamChild();
NS_OVERRIDE virtual bool IsBrowserStream() { return true; } virtual bool IsBrowserStream() MOZ_OVERRIDE { return true; }
NPError StreamConstructed( NPError StreamConstructed(
const nsCString& mimeType, const nsCString& mimeType,

2
dom/plugins/ipc/BrowserStreamParent.h
View File

@@ -24,7 +24,7 @@ public:
NPStream* stream); NPStream* stream);
virtual ~BrowserStreamParent(); virtual ~BrowserStreamParent();
NS_OVERRIDE virtual bool IsBrowserStream() { return true; } virtual bool IsBrowserStream() MOZ_OVERRIDE { return true; }
virtual bool AnswerNPN_RequestRead(const IPCByteRanges& ranges, virtual bool AnswerNPN_RequestRead(const IPCByteRanges& ranges,
NPError* result); NPError* result);

4
dom/plugins/ipc/ChildAsyncCall.h
View File

@@ -24,8 +24,8 @@ public:
ChildAsyncCall(PluginInstanceChild* instance, ChildAsyncCall(PluginInstanceChild* instance,
PluginThreadCallback aFunc, void* aUserData); PluginThreadCallback aFunc, void* aUserData);
NS_OVERRIDE void Run(); void Run() MOZ_OVERRIDE;
NS_OVERRIDE void Cancel(); void Cancel() MOZ_OVERRIDE;
protected: protected:
PluginInstanceChild* mInstance; PluginInstanceChild* mInstance;

6
dom/plugins/ipc/PluginBackgroundDestroyer.h
View File

@@ -31,8 +31,7 @@ public:
virtual ~PluginBackgroundDestroyerParent() { } virtual ~PluginBackgroundDestroyerParent() { }
private: private:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
switch(why) { switch(why) {
case Deletion: case Deletion:
@@ -64,8 +63,7 @@ public:
private: private:
// Implementing this for good hygiene. // Implementing this for good hygiene.
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ } { }
}; };

28
dom/plugins/ipc/PluginInstanceChild.h
View File

@@ -112,17 +112,15 @@ protected:
return true; return true;
} }
NS_OVERRIDE
virtual bool virtual bool
AnswerPaint(const NPRemoteEvent& event, int16_t* handled) AnswerPaint(const NPRemoteEvent& event, int16_t* handled) MOZ_OVERRIDE
{ {
PaintTracker pt; PaintTracker pt;
return AnswerNPP_HandleEvent(event, handled); return AnswerNPP_HandleEvent(event, handled);
} }
NS_OVERRIDE
virtual bool virtual bool
RecvWindowPosChanged(const NPRemoteEvent& event); RecvWindowPosChanged(const NPRemoteEvent& event) MOZ_OVERRIDE;
virtual bool virtual bool
AnswerNPP_Destroy(NPError* result); AnswerNPP_Destroy(NPError* result);
@@ -133,8 +131,8 @@ protected:
virtual bool virtual bool
DeallocPPluginScriptableObject(PPluginScriptableObjectChild* aObject); DeallocPPluginScriptableObject(PPluginScriptableObjectChild* aObject);
NS_OVERRIDE virtual bool virtual bool
RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectChild* aActor); RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectChild* aActor) MOZ_OVERRIDE;
virtual PBrowserStreamChild* virtual PBrowserStreamChild*
AllocPBrowserStream(const nsCString& url, AllocPBrowserStream(const nsCString& url,
@@ -177,8 +175,8 @@ protected:
const bool& file, const bool& file,
NPError* result); NPError* result);
NS_OVERRIDE virtual bool virtual bool
DeallocPStreamNotify(PStreamNotifyChild* notifyData); DeallocPStreamNotify(PStreamNotifyChild* notifyData) MOZ_OVERRIDE;
virtual bool virtual bool
AnswerSetPluginFocus(); AnswerSetPluginFocus();
@@ -247,21 +245,17 @@ private:
NPError DeallocateAsyncBitmapSurface(NPAsyncSurface *aSurface); NPError DeallocateAsyncBitmapSurface(NPAsyncSurface *aSurface);
NS_OVERRIDE
virtual bool RecvUpdateBackground(const SurfaceDescriptor& aBackground, virtual bool RecvUpdateBackground(const SurfaceDescriptor& aBackground,
const nsIntRect& aRect); const nsIntRect& aRect) MOZ_OVERRIDE;
NS_OVERRIDE
virtual PPluginBackgroundDestroyerChild* virtual PPluginBackgroundDestroyerChild*
AllocPPluginBackgroundDestroyer(); AllocPPluginBackgroundDestroyer() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
RecvPPluginBackgroundDestroyerConstructor(PPluginBackgroundDestroyerChild* aActor); RecvPPluginBackgroundDestroyerConstructor(PPluginBackgroundDestroyerChild* aActor) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
DeallocPPluginBackgroundDestroyer(PPluginBackgroundDestroyerChild* aActor); DeallocPPluginBackgroundDestroyer(PPluginBackgroundDestroyerChild* aActor) MOZ_OVERRIDE;
#if defined(OS_WIN) #if defined(OS_WIN)
static bool RegisterWindowClass(); static bool RegisterWindowClass();
@@ -334,7 +328,7 @@ private:
mWindowed(isWindowed) mWindowed(isWindowed)
{} {}
NS_OVERRIDE void Run(); void Run() MOZ_OVERRIDE;
WNDPROC GetProc(); WNDPROC GetProc();
HWND GetWnd() { return mWnd; } HWND GetWnd() { return mWnd; }

36
dom/plugins/ipc/PluginInstanceParent.h
View File

@@ -53,13 +53,13 @@ public:
bool Init(); bool Init();
NPError Destroy(); NPError Destroy();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual PPluginScriptableObjectParent* virtual PPluginScriptableObjectParent*
AllocPPluginScriptableObject(); AllocPPluginScriptableObject();
NS_OVERRIDE virtual bool virtual bool
RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectParent* aActor); RecvPPluginScriptableObjectConstructor(PPluginScriptableObjectParent* aActor) MOZ_OVERRIDE;
virtual bool virtual bool
DeallocPPluginScriptableObject(PPluginScriptableObjectParent* aObject); DeallocPPluginScriptableObject(PPluginScriptableObjectParent* aObject);
@@ -139,13 +139,13 @@ public:
const bool& file, const bool& file,
NPError* result); NPError* result);
NS_OVERRIDE virtual bool virtual bool
AnswerPStreamNotifyConstructor(PStreamNotifyParent* actor, AnswerPStreamNotifyConstructor(PStreamNotifyParent* actor,
const nsCString& url, const nsCString& url,
const nsCString& target, const nsCString& target,
const bool& post, const nsCString& buffer, const bool& post, const nsCString& buffer,
const bool& file, const bool& file,
NPError* result); NPError* result) MOZ_OVERRIDE;
virtual bool virtual bool
DeallocPStreamNotify(PStreamNotifyParent* notifyData); DeallocPStreamNotify(PStreamNotifyParent* notifyData);
@@ -173,17 +173,17 @@ public:
virtual bool virtual bool
AnswerNPN_PopPopupsEnabledState(); AnswerNPN_PopPopupsEnabledState();
NS_OVERRIDE virtual bool virtual bool
AnswerNPN_GetValueForURL(const NPNURLVariable& variable, AnswerNPN_GetValueForURL(const NPNURLVariable& variable,
const nsCString& url, const nsCString& url,
nsCString* value, NPError* result); nsCString* value, NPError* result) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
AnswerNPN_SetValueForURL(const NPNURLVariable& variable, AnswerNPN_SetValueForURL(const NPNURLVariable& variable,
const nsCString& url, const nsCString& url,
const nsCString& value, NPError* result); const nsCString& value, NPError* result) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
AnswerNPN_GetAuthenticationInfo(const nsCString& protocol, AnswerNPN_GetAuthenticationInfo(const nsCString& protocol,
const nsCString& host, const nsCString& host,
const int32_t& port, const int32_t& port,
@@ -191,9 +191,9 @@ public:
const nsCString& realm, const nsCString& realm,
nsCString* username, nsCString* username,
nsCString* password, nsCString* password,
NPError* result); NPError* result) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
AnswerNPN_ConvertPoint(const double& sourceX, AnswerNPN_ConvertPoint(const double& sourceX,
const bool& ignoreDestX, const bool& ignoreDestX,
const double& sourceY, const double& sourceY,
@@ -202,7 +202,7 @@ public:
const NPCoordinateSpace& destSpace, const NPCoordinateSpace& destSpace,
double *destX, double *destX,
double *destY, double *destY,
bool *result); bool *result) MOZ_OVERRIDE;
virtual bool virtual bool
AnswerNPN_InitAsyncSurface(const gfxIntSize& size, AnswerNPN_InitAsyncSurface(const gfxIntSize& size,
@@ -213,8 +213,8 @@ public:
virtual bool virtual bool
RecvRedrawPlugin(); RecvRedrawPlugin();
NS_OVERRIDE virtual bool virtual bool
RecvNegotiatedCarbon(); RecvNegotiatedCarbon() MOZ_OVERRIDE;
virtual bool RecvReleaseDXGISharedSurface(const DXGISharedSurfaceHandle &aHandle); virtual bool RecvReleaseDXGISharedSurface(const DXGISharedSurfaceHandle &aHandle);
@@ -292,13 +292,11 @@ private:
typedef mozilla::layers::ImageContainer ImageContainer; typedef mozilla::layers::ImageContainer ImageContainer;
ImageContainer *GetImageContainer(); ImageContainer *GetImageContainer();
NS_OVERRIDE
virtual PPluginBackgroundDestroyerParent* virtual PPluginBackgroundDestroyerParent*
AllocPPluginBackgroundDestroyer(); AllocPPluginBackgroundDestroyer() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
DeallocPPluginBackgroundDestroyer(PPluginBackgroundDestroyerParent* aActor); DeallocPPluginBackgroundDestroyer(PPluginBackgroundDestroyerParent* aActor) MOZ_OVERRIDE;
bool InternalGetValueForNPObject(NPNVariable aVariable, bool InternalGetValueForNPObject(NPNVariable aVariable,
PPluginScriptableObjectParent** aValue, PPluginScriptableObjectParent** aValue,

28
dom/plugins/ipc/PluginModuleChild.h
View File

@@ -78,15 +78,13 @@ class PluginModuleChild : public PPluginModuleChild
{ {
typedef mozilla::dom::PCrashReporterChild PCrashReporterChild; typedef mozilla::dom::PCrashReporterChild PCrashReporterChild;
protected: protected:
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child) MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE
{ {
return MediateRace(parent, child); return MediateRace(parent, child);
} }
NS_OVERRIDE virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
virtual bool ShouldContinueFromReplyTimeout();
// Implement the PPluginModuleChild interface // Implement the PPluginModuleChild interface
virtual bool AnswerNP_GetEntryPoints(NPError* rv); virtual bool AnswerNP_GetEntryPoints(NPError* rv);
@@ -163,8 +161,8 @@ protected:
MOZ_NORETURN void QuickExit(); MOZ_NORETURN void QuickExit();
NS_OVERRIDE virtual bool virtual bool
RecvProcessNativeEventsInRPCCall(); RecvProcessNativeEventsInRPCCall() MOZ_OVERRIDE;
public: public:
PluginModuleChild(); PluginModuleChild();
@@ -310,16 +308,12 @@ private:
static gboolean DetectNestedEventLoop(gpointer data); static gboolean DetectNestedEventLoop(gpointer data);
static gboolean ProcessBrowserEvents(gpointer data); static gboolean ProcessBrowserEvents(gpointer data);
NS_OVERRIDE virtual void EnteredCxxStack() MOZ_OVERRIDE;
virtual void EnteredCxxStack(); virtual void ExitedCxxStack() MOZ_OVERRIDE;
NS_OVERRIDE
virtual void ExitedCxxStack();
#elif defined(MOZ_WIDGET_QT) #elif defined(MOZ_WIDGET_QT)
NS_OVERRIDE virtual void EnteredCxxStack() MOZ_OVERRIDE;
virtual void EnteredCxxStack(); virtual void ExitedCxxStack() MOZ_OVERRIDE;
NS_OVERRIDE
virtual void ExitedCxxStack();
#endif #endif
PRLibrary* mLibrary; PRLibrary* mLibrary;
@@ -429,10 +423,8 @@ private:
static PLDHashOperator CollectForInstance(NPObjectData* d, void* userArg); static PLDHashOperator CollectForInstance(NPObjectData* d, void* userArg);
#if defined(OS_WIN) #if defined(OS_WIN)
NS_OVERRIDE virtual void EnteredCall() MOZ_OVERRIDE;
virtual void EnteredCall(); virtual void ExitedCall() MOZ_OVERRIDE;
NS_OVERRIDE
virtual void ExitedCall();
// Entered/ExitedCall notifications keep track of whether the plugin has // Entered/ExitedCall notifications keep track of whether the plugin has
// entered a nested event loop within this RPC call. // entered a nested event loop within this RPC call.

77
dom/plugins/ipc/PluginModuleParent.h
View File

@@ -93,12 +93,12 @@ public:
PluginModuleParent(const char* aFilePath); PluginModuleParent(const char* aFilePath);
virtual ~PluginModuleParent(); virtual ~PluginModuleParent();
NS_OVERRIDE virtual void SetPlugin(nsNPAPIPlugin* plugin) virtual void SetPlugin(nsNPAPIPlugin* plugin) MOZ_OVERRIDE
{ {
mPlugin = plugin; mPlugin = plugin;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
/** /**
* LoadModule * LoadModule
@@ -131,21 +131,18 @@ public:
void ProcessRemoteNativeEventsInRPCCall(); void ProcessRemoteNativeEventsInRPCCall();
protected: protected:
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child) MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE
{ {
return MediateRace(parent, child); return MediateRace(parent, child);
} }
virtual bool RecvXXX_HACK_FIXME_cjones(Shmem& mem) { NS_RUNTIMEABORT("not reached"); return false; } virtual bool RecvXXX_HACK_FIXME_cjones(Shmem& mem) { NS_RUNTIMEABORT("not reached"); return false; }
NS_OVERRIDE virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
virtual bool ShouldContinueFromReplyTimeout();
NS_OVERRIDE
virtual bool virtual bool
RecvBackUpXResources(const FileDescriptor& aXSocketFd); RecvBackUpXResources(const FileDescriptor& aXSocketFd) MOZ_OVERRIDE;
virtual bool virtual bool
AnswerNPN_UserAgent(nsCString* userAgent); AnswerNPN_UserAgent(nsCString* userAgent);
@@ -155,47 +152,46 @@ protected:
NPError* aError, NPError* aError,
bool* aBoolVal); bool* aBoolVal);
NS_OVERRIDE virtual bool AnswerProcessSomeEvents() MOZ_OVERRIDE;
virtual bool AnswerProcessSomeEvents();
NS_OVERRIDE virtual bool virtual bool
RecvProcessNativeEventsInRPCCall(); RecvProcessNativeEventsInRPCCall() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvPluginShowWindow(const uint32_t& aWindowId, const bool& aModal, RecvPluginShowWindow(const uint32_t& aWindowId, const bool& aModal,
const int32_t& aX, const int32_t& aY, const int32_t& aX, const int32_t& aY,
const size_t& aWidth, const size_t& aHeight); const size_t& aWidth, const size_t& aHeight) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvPluginHideWindow(const uint32_t& aWindowId); RecvPluginHideWindow(const uint32_t& aWindowId) MOZ_OVERRIDE;
NS_OVERRIDE virtual PCrashReporterParent* virtual PCrashReporterParent*
AllocPCrashReporter(mozilla::dom::NativeThreadId* id, AllocPCrashReporter(mozilla::dom::NativeThreadId* id,
PRUint32* processType); PRUint32* processType) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
DeallocPCrashReporter(PCrashReporterParent* actor); DeallocPCrashReporter(PCrashReporterParent* actor) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvSetCursor(const NSCursorInfo& aCursorInfo); RecvSetCursor(const NSCursorInfo& aCursorInfo) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvShowCursor(const bool& aShow); RecvShowCursor(const bool& aShow) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvPushCursor(const NSCursorInfo& aCursorInfo); RecvPushCursor(const NSCursorInfo& aCursorInfo) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvPopCursor(); RecvPopCursor() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvGetNativeCursorsSupported(bool* supported); RecvGetNativeCursorsSupported(bool* supported) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvNPN_SetException(PPluginScriptableObjectParent* aActor, RecvNPN_SetException(PPluginScriptableObjectParent* aActor,
const nsCString& aMessage); const nsCString& aMessage) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvNPN_ReloadPlugins(const bool& aReloadPages); RecvNPN_ReloadPlugins(const bool& aReloadPages) MOZ_OVERRIDE;
static PluginInstanceParent* InstCast(NPP instance); static PluginInstanceParent* InstCast(NPP instance);
static BrowserStreamParent* StreamCast(NPP instance, NPStream* s); static BrowserStreamParent* StreamCast(NPP instance, NPStream* s);
@@ -244,17 +240,14 @@ private:
virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window); virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window);
virtual nsresult GetImageContainer(NPP instance, mozilla::layers::ImageContainer** aContainer); virtual nsresult GetImageContainer(NPP instance, mozilla::layers::ImageContainer** aContainer);
virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize); virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize);
NS_OVERRIDE virtual bool UseAsyncPainting() { return true; } virtual bool UseAsyncPainting() MOZ_OVERRIDE { return true; }
NS_OVERRIDE virtual nsresult SetBackgroundUnknown(NPP instance) MOZ_OVERRIDE;
virtual nsresult SetBackgroundUnknown(NPP instance);
NS_OVERRIDE
virtual nsresult BeginUpdateBackground(NPP instance, virtual nsresult BeginUpdateBackground(NPP instance,
const nsIntRect& aRect, const nsIntRect& aRect,
gfxContext** aCtx); gfxContext** aCtx) MOZ_OVERRIDE;
NS_OVERRIDE
virtual nsresult EndUpdateBackground(NPP instance, virtual nsresult EndUpdateBackground(NPP instance,
gfxContext* aCtx, gfxContext* aCtx,
const nsIntRect& aRect); const nsIntRect& aRect) MOZ_OVERRIDE;
#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK) #if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
virtual nsresult NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error); virtual nsresult NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error);
@@ -320,7 +313,7 @@ private:
#ifdef MOZ_CRASHREPORTER_INJECTOR #ifdef MOZ_CRASHREPORTER_INJECTOR
void InitializeInjector(); void InitializeInjector();
NS_OVERRIDE void OnCrash(DWORD processID); void OnCrash(DWORD processID) MOZ_OVERRIDE;
DWORD mFlashProcess1; DWORD mFlashProcess1;
DWORD mFlashProcess2; DWORD mFlashProcess2;

4
dom/plugins/ipc/PluginProcessChild.h
View File

@@ -25,8 +25,8 @@ public:
virtual ~PluginProcessChild() virtual ~PluginProcessChild()
{ } { }
NS_OVERRIDE virtual bool Init(); virtual bool Init() MOZ_OVERRIDE;
NS_OVERRIDE virtual void CleanUp(); virtual void CleanUp() MOZ_OVERRIDE;
protected: protected:
static PluginProcessChild* current() { static PluginProcessChild* current() {

2
dom/plugins/ipc/PluginStreamChild.h
View File

@@ -22,7 +22,7 @@ public:
PluginStreamChild(); PluginStreamChild();
virtual ~PluginStreamChild() { } virtual ~PluginStreamChild() { }
NS_OVERRIDE virtual bool IsBrowserStream() { return false; } virtual bool IsBrowserStream() MOZ_OVERRIDE { return false; }
virtual bool Answer__delete__(const NPReason& reason, virtual bool Answer__delete__(const NPReason& reason,
const bool& artificial); const bool& artificial);

2
dom/plugins/ipc/PluginStreamParent.h
View File

@@ -24,7 +24,7 @@ public:
const nsCString& target, NPError* result); const nsCString& target, NPError* result);
virtual ~PluginStreamParent() { } virtual ~PluginStreamParent() { }
NS_OVERRIDE virtual bool IsBrowserStream() { return false; } virtual bool IsBrowserStream() MOZ_OVERRIDE { return false; }
virtual bool AnswerNPN_Write(const Buffer& data, int32_t* written); virtual bool AnswerNPN_Write(const Buffer& data, int32_t* written);

4
dom/plugins/ipc/StreamNotifyChild.h
View File

@@ -26,7 +26,7 @@ public:
, mBrowserStream(NULL) , mBrowserStream(NULL)
{ } { }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
void SetValid(void* aClosure) { void SetValid(void* aClosure) {
mClosure = aClosure; mClosure = aClosure;
@@ -35,7 +35,7 @@ public:
void NPP_URLNotify(NPReason reason); void NPP_URLNotify(NPReason reason);
private: private:
NS_OVERRIDE virtual bool Recv__delete__(const NPReason& reason); virtual bool Recv__delete__(const NPReason& reason) MOZ_OVERRIDE;
bool RecvRedirectNotify(const nsCString& url, const int32_t& status); bool RecvRedirectNotify(const nsCString& url, const int32_t& status);

30
dom/sms/src/ipc/SmsChild.h
View File

@@ -15,21 +15,21 @@ namespace sms {
class SmsChild : public PSmsChild class SmsChild : public PSmsChild
{ {
public: public:
NS_OVERRIDE virtual bool RecvNotifyReceivedMessage(const SmsMessageData& aMessage); virtual bool RecvNotifyReceivedMessage(const SmsMessageData& aMessage) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifySentMessage(const SmsMessageData& aMessage); virtual bool RecvNotifySentMessage(const SmsMessageData& aMessage) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyDeliveredMessage(const SmsMessageData& aMessage); virtual bool RecvNotifyDeliveredMessage(const SmsMessageData& aMessage) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestSmsSent(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestSmsSent(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestSmsSendFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestSmsSendFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestGotSms(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestGotSms(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestGetSmsFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestGetSmsFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestSmsDeleted(const bool& aDeleted, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestSmsDeleted(const bool& aDeleted, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestSmsDeleteFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestSmsDeleteFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestNoMessageInList(const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestNoMessageInList(const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestCreateMessageList(const PRInt32& aListId, const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestCreateMessageList(const PRInt32& aListId, const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestGotNextMessage(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestGotNextMessage(const SmsMessageData& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestReadListFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestReadListFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestMarkedMessageRead(const bool& aRead, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestMarkedMessageRead(const bool& aRead, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvNotifyRequestMarkMessageReadFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvNotifyRequestMarkMessageReadFailed(const PRInt32& aError, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
}; };
} // namespace sms } // namespace sms

22
dom/sms/src/ipc/SmsParent.h
View File

@@ -24,17 +24,17 @@ public:
SmsParent(); SmsParent();
NS_OVERRIDE virtual bool RecvHasSupport(bool* aHasSupport); virtual bool RecvHasSupport(bool* aHasSupport) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvGetNumberOfMessagesForText(const nsString& aText, PRUint16* aResult); virtual bool RecvGetNumberOfMessagesForText(const nsString& aText, PRUint16* aResult) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvSendMessage(const nsString& aNumber, const nsString& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvSendMessage(const nsString& aNumber, const nsString& aMessage, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvSaveReceivedMessage(const nsString& aSender, const nsString& aBody, const PRUint64& aDate, PRInt32* aId); virtual bool RecvSaveReceivedMessage(const nsString& aSender, const nsString& aBody, const PRUint64& aDate, PRInt32* aId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvSaveSentMessage(const nsString& aRecipient, const nsString& aBody, const PRUint64& aDate, PRInt32* aId); virtual bool RecvSaveSentMessage(const nsString& aRecipient, const nsString& aBody, const PRUint64& aDate, PRInt32* aId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvGetMessage(const PRInt32& aMessageId, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvGetMessage(const PRInt32& aMessageId, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvDeleteMessage(const PRInt32& aMessageId, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvDeleteMessage(const PRInt32& aMessageId, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvCreateMessageList(const SmsFilterData& aFilter, const bool& aReverse, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvCreateMessageList(const SmsFilterData& aFilter, const bool& aReverse, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvGetNextMessageInList(const PRInt32& aListId, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvGetNextMessageInList(const PRInt32& aListId, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvClearMessageList(const PRInt32& aListId); virtual bool RecvClearMessageList(const PRInt32& aListId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvMarkMessageRead(const PRInt32& aMessageId, const bool& aValue, const PRInt32& aRequestId, const PRUint64& aProcessId); virtual bool RecvMarkMessageRead(const PRInt32& aMessageId, const bool& aValue, const PRInt32& aRequestId, const PRUint64& aProcessId) MOZ_OVERRIDE;
protected: protected:
virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why);

3
gfx/layers/ipc/ShadowLayerChild.h
View File

@@ -24,8 +24,7 @@ public:
ShadowableLayer* layer() const { return mLayer; } ShadowableLayer* layer() const { return mLayer; }
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
private: private:
ShadowableLayer* mLayer; ShadowableLayer* mLayer;

3
gfx/layers/ipc/ShadowLayerParent.h
View File

@@ -32,8 +32,7 @@ public:
ContainerLayer* AsContainer() const; ContainerLayer* AsContainer() const;
private: private:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
nsRefPtr<Layer> mLayer; nsRefPtr<Layer> mLayer;
}; };

3
gfx/thebes/gfxImageSurface.h
View File

@@ -89,9 +89,8 @@ public:
virtual already_AddRefed<gfxImageSurface> GetAsImageSurface(); virtual already_AddRefed<gfxImageSurface> GetAsImageSurface();
/** See gfxASurface.h. */ /** See gfxASurface.h. */
NS_OVERRIDE
virtual void MovePixels(const nsIntRect& aSourceRect, virtual void MovePixels(const nsIntRect& aSourceRect,
const nsIntPoint& aDestTopLeft); const nsIntPoint& aDestTopLeft) MOZ_OVERRIDE;
protected: protected:
gfxImageSurface(); gfxImageSurface();

162
hal/sandbox/SandboxHal.cpp
View File

@@ -289,10 +289,10 @@ class HalParent : public PHalParent
, public SwitchObserver , public SwitchObserver
{ {
public: public:
NS_OVERRIDE virtual bool virtual bool
RecvVibrate(const InfallibleTArray<unsigned int>& pattern, RecvVibrate(const InfallibleTArray<unsigned int>& pattern,
const InfallibleTArray<uint64_t> &id, const InfallibleTArray<uint64_t> &id,
PBrowserParent *browserParent) PBrowserParent *browserParent) MOZ_OVERRIDE
{ {
// Check whether browserParent is active. We should have already // Check whether browserParent is active. We should have already
// checked that the corresponding window is active, but this check // checked that the corresponding window is active, but this check
@@ -316,9 +316,9 @@ public:
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvCancelVibrate(const InfallibleTArray<uint64_t> &id, RecvCancelVibrate(const InfallibleTArray<uint64_t> &id,
PBrowserParent *browserParent) PBrowserParent *browserParent) MOZ_OVERRIDE
{ {
TabParent *tabParent = static_cast<TabParent*>(browserParent); TabParent *tabParent = static_cast<TabParent*>(browserParent);
nsCOMPtr<nsIDOMWindow> window = nsCOMPtr<nsIDOMWindow> window =
@@ -328,42 +328,42 @@ public:
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableBatteryNotifications() { RecvEnableBatteryNotifications() MOZ_OVERRIDE {
hal::RegisterBatteryObserver(this); hal::RegisterBatteryObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableBatteryNotifications() { RecvDisableBatteryNotifications() MOZ_OVERRIDE {
hal::UnregisterBatteryObserver(this); hal::UnregisterBatteryObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetCurrentBatteryInformation(BatteryInformation* aBatteryInfo) { RecvGetCurrentBatteryInformation(BatteryInformation* aBatteryInfo) MOZ_OVERRIDE {
hal::GetCurrentBatteryInformation(aBatteryInfo); hal::GetCurrentBatteryInformation(aBatteryInfo);
return true; return true;
} }
void Notify(const BatteryInformation& aBatteryInfo) { void Notify(const BatteryInformation& aBatteryInfo) MOZ_OVERRIDE {
unused << SendNotifyBatteryChange(aBatteryInfo); unused << SendNotifyBatteryChange(aBatteryInfo);
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableNetworkNotifications() { RecvEnableNetworkNotifications() MOZ_OVERRIDE {
hal::RegisterNetworkObserver(this); hal::RegisterNetworkObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableNetworkNotifications() { RecvDisableNetworkNotifications() MOZ_OVERRIDE {
hal::UnregisterNetworkObserver(this); hal::UnregisterNetworkObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetCurrentNetworkInformation(NetworkInformation* aNetworkInfo) { RecvGetCurrentNetworkInformation(NetworkInformation* aNetworkInfo) MOZ_OVERRIDE {
hal::GetCurrentNetworkInformation(aNetworkInfo); hal::GetCurrentNetworkInformation(aNetworkInfo);
return true; return true;
} }
@@ -372,33 +372,33 @@ public:
unused << SendNotifyNetworkChange(aNetworkInfo); unused << SendNotifyNetworkChange(aNetworkInfo);
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableScreenConfigurationNotifications() { RecvEnableScreenConfigurationNotifications() MOZ_OVERRIDE {
hal::RegisterScreenConfigurationObserver(this); hal::RegisterScreenConfigurationObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableScreenConfigurationNotifications() { RecvDisableScreenConfigurationNotifications() MOZ_OVERRIDE {
hal::UnregisterScreenConfigurationObserver(this); hal::UnregisterScreenConfigurationObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetCurrentScreenConfiguration(ScreenConfiguration* aScreenConfiguration) { RecvGetCurrentScreenConfiguration(ScreenConfiguration* aScreenConfiguration) MOZ_OVERRIDE {
hal::GetCurrentScreenConfiguration(aScreenConfiguration); hal::GetCurrentScreenConfiguration(aScreenConfiguration);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvLockScreenOrientation(const dom::ScreenOrientation& aOrientation, bool* aAllowed) RecvLockScreenOrientation(const dom::ScreenOrientation& aOrientation, bool* aAllowed) MOZ_OVERRIDE
{ {
*aAllowed = hal::LockScreenOrientation(aOrientation); *aAllowed = hal::LockScreenOrientation(aOrientation);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvUnlockScreenOrientation() RecvUnlockScreenOrientation() MOZ_OVERRIDE
{ {
hal::UnlockScreenOrientation(); hal::UnlockScreenOrientation();
return true; return true;
@@ -408,98 +408,98 @@ public:
unused << SendNotifyScreenConfigurationChange(aScreenConfiguration); unused << SendNotifyScreenConfigurationChange(aScreenConfiguration);
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetScreenEnabled(bool *enabled) RecvGetScreenEnabled(bool *enabled) MOZ_OVERRIDE
{ {
*enabled = hal::GetScreenEnabled(); *enabled = hal::GetScreenEnabled();
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvSetScreenEnabled(const bool &enabled) RecvSetScreenEnabled(const bool &enabled) MOZ_OVERRIDE
{ {
hal::SetScreenEnabled(enabled); hal::SetScreenEnabled(enabled);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetCpuSleepAllowed(bool *allowed) RecvGetCpuSleepAllowed(bool *allowed) MOZ_OVERRIDE
{ {
*allowed = hal::GetCpuSleepAllowed(); *allowed = hal::GetCpuSleepAllowed();
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvSetCpuSleepAllowed(const bool &allowed) RecvSetCpuSleepAllowed(const bool &allowed) MOZ_OVERRIDE
{ {
hal::SetCpuSleepAllowed(allowed); hal::SetCpuSleepAllowed(allowed);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetScreenBrightness(double *brightness) RecvGetScreenBrightness(double *brightness) MOZ_OVERRIDE
{ {
*brightness = hal::GetScreenBrightness(); *brightness = hal::GetScreenBrightness();
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvSetScreenBrightness(const double &brightness) RecvSetScreenBrightness(const double &brightness) MOZ_OVERRIDE
{ {
hal::SetScreenBrightness(brightness); hal::SetScreenBrightness(brightness);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvSetLight(const LightType& aLight, const hal::LightConfiguration& aConfig, bool *status) RecvSetLight(const LightType& aLight, const hal::LightConfiguration& aConfig, bool *status) MOZ_OVERRIDE
{ {
*status = hal::SetLight(aLight, aConfig); *status = hal::SetLight(aLight, aConfig);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetLight(const LightType& aLight, LightConfiguration* aConfig, bool* status) RecvGetLight(const LightType& aLight, LightConfiguration* aConfig, bool* status) MOZ_OVERRIDE
{ {
*status = hal::GetLight(aLight, aConfig); *status = hal::GetLight(aLight, aConfig);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvAdjustSystemClock(const int32_t &aDeltaMilliseconds) RecvAdjustSystemClock(const int32_t &aDeltaMilliseconds) MOZ_OVERRIDE
{ {
hal::AdjustSystemClock(aDeltaMilliseconds); hal::AdjustSystemClock(aDeltaMilliseconds);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvSetTimezone(const nsCString& aTimezoneSpec) RecvSetTimezone(const nsCString& aTimezoneSpec) MOZ_OVERRIDE
{ {
hal::SetTimezone(aTimezoneSpec); hal::SetTimezone(aTimezoneSpec);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvReboot() RecvReboot() MOZ_OVERRIDE
{ {
hal::Reboot(); hal::Reboot();
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvPowerOff() RecvPowerOff() MOZ_OVERRIDE
{ {
hal::PowerOff(); hal::PowerOff();
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableSensorNotifications(const SensorType &aSensor) { RecvEnableSensorNotifications(const SensorType &aSensor) MOZ_OVERRIDE {
hal::RegisterSensorObserver(aSensor, this); hal::RegisterSensorObserver(aSensor, this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableSensorNotifications(const SensorType &aSensor) { RecvDisableSensorNotifications(const SensorType &aSensor) MOZ_OVERRIDE {
hal::UnregisterSensorObserver(aSensor, this); hal::UnregisterSensorObserver(aSensor, this);
return true; return true;
} }
@@ -508,31 +508,31 @@ public:
unused << SendNotifySensorChange(aSensorData); unused << SendNotifySensorChange(aSensorData);
} }
NS_OVERRIDE virtual bool virtual bool
RecvModifyWakeLock(const nsString &aTopic, RecvModifyWakeLock(const nsString &aTopic,
const WakeLockControl &aLockAdjust, const WakeLockControl &aLockAdjust,
const WakeLockControl &aHiddenAdjust) const WakeLockControl &aHiddenAdjust) MOZ_OVERRIDE
{ {
hal::ModifyWakeLock(aTopic, aLockAdjust, aHiddenAdjust); hal::ModifyWakeLock(aTopic, aLockAdjust, aHiddenAdjust);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableWakeLockNotifications() RecvEnableWakeLockNotifications() MOZ_OVERRIDE
{ {
hal::RegisterWakeLockObserver(this); hal::RegisterWakeLockObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableWakeLockNotifications() RecvDisableWakeLockNotifications() MOZ_OVERRIDE
{ {
hal::UnregisterWakeLockObserver(this); hal::UnregisterWakeLockObserver(this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetWakeLockInfo(const nsString &aTopic, WakeLockInformation *aWakeLockInfo) RecvGetWakeLockInfo(const nsString &aTopic, WakeLockInformation *aWakeLockInfo) MOZ_OVERRIDE
{ {
hal::GetWakeLockInfo(aTopic, aWakeLockInfo); hal::GetWakeLockInfo(aTopic, aWakeLockInfo);
return true; return true;
@@ -543,15 +543,15 @@ public:
unused << SendNotifyWakeLockChange(aWakeLockInfo); unused << SendNotifyWakeLockChange(aWakeLockInfo);
} }
NS_OVERRIDE virtual bool virtual bool
RecvEnableSwitchNotifications(const SwitchDevice& aDevice) RecvEnableSwitchNotifications(const SwitchDevice& aDevice) MOZ_OVERRIDE
{ {
hal::RegisterSwitchObserver(aDevice, this); hal::RegisterSwitchObserver(aDevice, this);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvDisableSwitchNotifications(const SwitchDevice& aDevice) RecvDisableSwitchNotifications(const SwitchDevice& aDevice) MOZ_OVERRIDE
{ {
hal::UnregisterSwitchObserver(aDevice, this); hal::UnregisterSwitchObserver(aDevice, this);
return true; return true;
@@ -562,8 +562,8 @@ public:
unused << SendNotifySwitchChange(aSwitchEvent); unused << SendNotifySwitchChange(aSwitchEvent);
} }
NS_OVERRIDE virtual bool virtual bool
RecvGetCurrentSwitchState(const SwitchDevice& aDevice, hal::SwitchState *aState) RecvGetCurrentSwitchState(const SwitchDevice& aDevice, hal::SwitchState *aState) MOZ_OVERRIDE
{ {
*aState = hal::GetCurrentSwitchState(aDevice); *aState = hal::GetCurrentSwitchState(aDevice);
return true; return true;
@@ -572,35 +572,35 @@ public:
class HalChild : public PHalChild { class HalChild : public PHalChild {
public: public:
NS_OVERRIDE virtual bool virtual bool
RecvNotifyBatteryChange(const BatteryInformation& aBatteryInfo) { RecvNotifyBatteryChange(const BatteryInformation& aBatteryInfo) MOZ_OVERRIDE {
hal::NotifyBatteryChange(aBatteryInfo); hal::NotifyBatteryChange(aBatteryInfo);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvNotifySensorChange(const hal::SensorData &aSensorData); RecvNotifySensorChange(const hal::SensorData &aSensorData) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool virtual bool
RecvNotifyNetworkChange(const NetworkInformation& aNetworkInfo) { RecvNotifyNetworkChange(const NetworkInformation& aNetworkInfo) MOZ_OVERRIDE {
hal::NotifyNetworkChange(aNetworkInfo); hal::NotifyNetworkChange(aNetworkInfo);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvNotifyWakeLockChange(const WakeLockInformation& aWakeLockInfo) { RecvNotifyWakeLockChange(const WakeLockInformation& aWakeLockInfo) MOZ_OVERRIDE {
hal::NotifyWakeLockChange(aWakeLockInfo); hal::NotifyWakeLockChange(aWakeLockInfo);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvNotifyScreenConfigurationChange(const ScreenConfiguration& aScreenConfiguration) { RecvNotifyScreenConfigurationChange(const ScreenConfiguration& aScreenConfiguration) MOZ_OVERRIDE {
hal::NotifyScreenConfigurationChange(aScreenConfiguration); hal::NotifyScreenConfigurationChange(aScreenConfiguration);
return true; return true;
} }
NS_OVERRIDE virtual bool virtual bool
RecvNotifySwitchChange(const mozilla::hal::SwitchEvent& aEvent) { RecvNotifySwitchChange(const mozilla::hal::SwitchEvent& aEvent) MOZ_OVERRIDE {
hal::NotifySwitchChange(aEvent); hal::NotifySwitchChange(aEvent);
return true; return true;
} }

18
ipc/glue/AsyncChannel.h
View File

@@ -168,13 +168,13 @@ public:
// These methods acquire the monitor and forward to the // These methods acquire the monitor and forward to the
// similarly named methods in AsyncChannel below // similarly named methods in AsyncChannel below
// (OnMessageReceivedFromLink(), etc) // (OnMessageReceivedFromLink(), etc)
NS_OVERRIDE virtual void OnMessageReceived(const Message& msg); virtual void OnMessageReceived(const Message& msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void OnChannelConnected(int32 peer_pid); virtual void OnChannelConnected(int32 peer_pid) MOZ_OVERRIDE;
NS_OVERRIDE virtual void OnChannelError(); virtual void OnChannelError() MOZ_OVERRIDE;
NS_OVERRIDE virtual void EchoMessage(Message *msg); virtual void EchoMessage(Message *msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void SendMessage(Message *msg); virtual void SendMessage(Message *msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void SendClose(); virtual void SendClose() MOZ_OVERRIDE;
}; };
class ThreadLink : public Link { class ThreadLink : public Link {
@@ -185,9 +185,9 @@ public:
ThreadLink(AsyncChannel *aChan, AsyncChannel *aTargetChan); ThreadLink(AsyncChannel *aChan, AsyncChannel *aTargetChan);
virtual ~ThreadLink(); virtual ~ThreadLink();
NS_OVERRIDE virtual void EchoMessage(Message *msg); virtual void EchoMessage(Message *msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void SendMessage(Message *msg); virtual void SendMessage(Message *msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void SendClose(); virtual void SendClose() MOZ_OVERRIDE;
}; };
protected: protected:

19
ipc/glue/RPCChannel.h
View File

@@ -86,18 +86,15 @@ public:
virtual ~RPCChannel(); virtual ~RPCChannel();
NS_OVERRIDE void Clear() MOZ_OVERRIDE;
void Clear();
// Make an RPC to the other side of the channel // Make an RPC to the other side of the channel
bool Call(Message* msg, Message* reply); bool Call(Message* msg, Message* reply);
// RPCChannel overrides these so that the async and sync messages // RPCChannel overrides these so that the async and sync messages
// can be counted against mStackFrames // can be counted against mStackFrames
NS_OVERRIDE virtual bool Send(Message* msg) MOZ_OVERRIDE;
virtual bool Send(Message* msg); virtual bool Send(Message* msg, Message* reply) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool Send(Message* msg, Message* reply);
// Asynchronously, send the child a message that puts it in such a // Asynchronously, send the child a message that puts it in such a
// state that it can't send messages to the parent unless the // state that it can't send messages to the parent unless the
@@ -127,8 +124,7 @@ public:
return !mCxxStackFrames.empty(); return !mCxxStackFrames.empty();
} }
NS_OVERRIDE virtual bool OnSpecialMessage(uint16 id, const Message& msg) MOZ_OVERRIDE;
virtual bool OnSpecialMessage(uint16 id, const Message& msg);
/** /**
@@ -149,8 +145,8 @@ protected:
#endif #endif
protected: protected:
NS_OVERRIDE virtual void OnMessageReceivedFromLink(const Message& msg); virtual void OnMessageReceivedFromLink(const Message& msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void OnChannelErrorFromLink(); virtual void OnChannelErrorFromLink() MOZ_OVERRIDE;
private: private:
// Called on worker thread only // Called on worker thread only
@@ -159,8 +155,7 @@ private:
return static_cast<RPCListener*>(mListener); return static_cast<RPCListener*>(mListener);
} }
NS_OVERRIDE virtual bool ShouldDeferNotifyMaybeError() const MOZ_OVERRIDE {
virtual bool ShouldDeferNotifyMaybeError() const {
return IsOnCxxStack(); return IsOnCxxStack();
} }

1
ipc/glue/SharedMemory.h
View File

@@ -10,6 +10,7 @@
#include "nsDebug.h" #include "nsDebug.h"
#include "nsISupportsImpl.h" // NS_INLINE_DECL_REFCOUNTING #include "nsISupportsImpl.h" // NS_INLINE_DECL_REFCOUNTING
#include "mozilla/Attributes.h"
// //
// This is a low-level wrapper around platform shared memory. Don't // This is a low-level wrapper around platform shared memory. Don't

12
ipc/glue/SharedMemoryBasic_android.h
View File

@@ -31,20 +31,16 @@ public:
virtual ~SharedMemoryBasic(); virtual ~SharedMemoryBasic();
NS_OVERRIDE virtual bool Create(size_t aNbytes) MOZ_OVERRIDE;
virtual bool Create(size_t aNbytes);
NS_OVERRIDE virtual bool Map(size_t nBytes) MOZ_OVERRIDE;
virtual bool Map(size_t nBytes);
NS_OVERRIDE virtual void* memory() const MOZ_OVERRIDE
virtual void* memory() const
{ {
return mMemory; return mMemory;
} }
NS_OVERRIDE virtual SharedMemoryType Type() const MOZ_OVERRIDE
virtual SharedMemoryType Type() const
{ {
return TYPE_BASIC; return TYPE_BASIC;
} }

12
ipc/glue/SharedMemoryBasic_chromium.h
View File

@@ -35,8 +35,7 @@ public:
{ {
} }
NS_OVERRIDE virtual bool Create(size_t aNbytes) MOZ_OVERRIDE
virtual bool Create(size_t aNbytes)
{ {
bool ok = mSharedMemory.Create("", false, false, aNbytes); bool ok = mSharedMemory.Create("", false, false, aNbytes);
if (ok) { if (ok) {
@@ -45,8 +44,7 @@ public:
return ok; return ok;
} }
NS_OVERRIDE virtual bool Map(size_t nBytes) MOZ_OVERRIDE
virtual bool Map(size_t nBytes)
{ {
bool ok = mSharedMemory.Map(nBytes); bool ok = mSharedMemory.Map(nBytes);
if (ok) { if (ok) {
@@ -55,14 +53,12 @@ public:
return ok; return ok;
} }
NS_OVERRIDE virtual void* memory() const MOZ_OVERRIDE
virtual void* memory() const
{ {
return mSharedMemory.memory(); return mSharedMemory.memory();
} }
NS_OVERRIDE virtual SharedMemoryType Type() const MOZ_OVERRIDE
virtual SharedMemoryType Type() const
{ {
return TYPE_BASIC; return TYPE_BASIC;
} }

12
ipc/glue/SharedMemorySysV.h
View File

@@ -59,8 +59,7 @@ public:
mData = nsnull; mData = nsnull;
} }
NS_OVERRIDE virtual bool Create(size_t aNbytes) MOZ_OVERRIDE
virtual bool Create(size_t aNbytes)
{ {
int id = shmget(IPC_PRIVATE, aNbytes, IPC_CREAT | 0600); int id = shmget(IPC_PRIVATE, aNbytes, IPC_CREAT | 0600);
if (id == -1) if (id == -1)
@@ -73,8 +72,7 @@ public:
return Map(aNbytes); return Map(aNbytes);
} }
NS_OVERRIDE virtual bool Map(size_t nBytes) MOZ_OVERRIDE
virtual bool Map(size_t nBytes)
{ {
// already mapped // already mapped
if (mData) if (mData)
@@ -113,14 +111,12 @@ public:
return true; return true;
} }
NS_OVERRIDE virtual void* memory() const MOZ_OVERRIDE
virtual void* memory() const
{ {
return mData; return mData;
} }
NS_OVERRIDE virtual SharedMemoryType Type() const MOZ_OVERRIDE
virtual SharedMemoryType Type() const
{ {
return TYPE_SYSV; return TYPE_SYSV;
} }

7
ipc/glue/SyncChannel.h
View File

@@ -41,8 +41,7 @@ public:
SyncChannel(SyncListener* aListener); SyncChannel(SyncListener* aListener);
virtual ~SyncChannel(); virtual ~SyncChannel();
NS_OVERRIDE virtual bool Send(Message* msg) MOZ_OVERRIDE {
virtual bool Send(Message* msg) {
return AsyncChannel::Send(msg); return AsyncChannel::Send(msg);
} }
@@ -106,8 +105,8 @@ protected:
protected: protected:
// Executed on the link thread // Executed on the link thread
// Override the AsyncChannel handler so we can dispatch sync messages // Override the AsyncChannel handler so we can dispatch sync messages
NS_OVERRIDE virtual void OnMessageReceivedFromLink(const Message& msg); virtual void OnMessageReceivedFromLink(const Message& msg) MOZ_OVERRIDE;
NS_OVERRIDE virtual void OnChannelErrorFromLink(); virtual void OnChannelErrorFromLink() MOZ_OVERRIDE;
// Executed on the worker thread // Executed on the worker thread
bool ProcessingSyncMessage() const { bool ProcessingSyncMessage() const {

3
ipc/ipdl/test/cxx/TestBadActor.h
View File

@@ -25,8 +25,7 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction"); fail("unexpected destruction");

30
ipc/ipdl/test/cxx/TestBlockChild.h
View File

@@ -26,20 +26,15 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual bool RecvP1() MOZ_OVERRIDE;
virtual bool RecvP1();
NS_OVERRIDE virtual bool RecvP2() MOZ_OVERRIDE;
virtual bool RecvP2();
NS_OVERRIDE virtual bool RecvDone() MOZ_OVERRIDE;
virtual bool RecvDone();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -65,20 +60,15 @@ public:
virtual ~TestBlockChildChild() { } virtual ~TestBlockChildChild() { }
protected: protected:
NS_OVERRIDE virtual bool RecvPoke1() MOZ_OVERRIDE;
virtual bool RecvPoke1();
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual bool RecvPoke2() MOZ_OVERRIDE;
virtual bool RecvPoke2();
NS_OVERRIDE virtual bool RecvLastPoke() MOZ_OVERRIDE;
virtual bool RecvLastPoke();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

48
ipc/ipdl/test/cxx/TestBridgeMain.h
View File

@@ -31,13 +31,11 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual PTestBridgeMainSubParent* virtual PTestBridgeMainSubParent*
AllocPTestBridgeMainSub(Transport* transport, AllocPTestBridgeMainSub(Transport* transport,
ProcessId otherProcess); ProcessId otherProcess) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
class TestBridgeMainSubParent : class TestBridgeMainSubParent :
@@ -50,15 +48,11 @@ public:
virtual ~TestBridgeMainSubParent() {} virtual ~TestBridgeMainSubParent() {}
protected: protected:
NS_OVERRIDE virtual bool RecvHello() MOZ_OVERRIDE;
virtual bool RecvHello(); virtual bool RecvHelloSync() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool AnswerHelloRpc() MOZ_OVERRIDE;
virtual bool RecvHelloSync();
NS_OVERRIDE
virtual bool AnswerHelloRpc();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
Transport* mTransport; Transport* mTransport;
}; };
@@ -76,11 +70,9 @@ public:
virtual ~TestBridgeMainChild() {} virtual ~TestBridgeMainChild() {}
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
IPDLUnitTestSubprocess* mSubprocess; IPDLUnitTestSubprocess* mSubprocess;
}; };
@@ -95,11 +87,9 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvBridgeEm() MOZ_OVERRIDE;
virtual bool RecvBridgeEm();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -113,16 +103,13 @@ public:
virtual ~TestBridgeSubChild() {} virtual ~TestBridgeSubChild() {}
protected: protected:
NS_OVERRIDE virtual bool RecvPing() MOZ_OVERRIDE;
virtual bool RecvPing();
NS_OVERRIDE
virtual PTestBridgeMainSubChild* virtual PTestBridgeMainSubChild*
AllocPTestBridgeMainSub(Transport* transport, AllocPTestBridgeMainSub(Transport* transport,
ProcessId otherProcess); ProcessId otherProcess) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
class TestBridgeMainSubChild : class TestBridgeMainSubChild :
@@ -136,13 +123,10 @@ public:
virtual ~TestBridgeMainSubChild() {} virtual ~TestBridgeMainSubChild() {}
protected: protected:
NS_OVERRIDE virtual bool RecvHi() MOZ_OVERRIDE;
virtual bool RecvHi(); virtual bool AnswerHiRpc() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool AnswerHiRpc();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
bool mGotHi; bool mGotHi;
Transport* mTransport; Transport* mTransport;

9
ipc/ipdl/test/cxx/TestCrashCleanup.h
View File

@@ -23,8 +23,7 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -43,11 +42,9 @@ public:
virtual ~TestCrashCleanupChild(); virtual ~TestCrashCleanupChild();
protected: protected:
NS_OVERRIDE virtual bool AnswerDIEDIEDIE() MOZ_OVERRIDE;
virtual bool AnswerDIEDIEDIE();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
fail("should have 'crashed'!"); fail("should have 'crashed'!");
} }

85
ipc/ipdl/test/cxx/TestDataStructures.h
View File

@@ -24,8 +24,7 @@ public:
{ } { }
virtual ~TestDataStructuresSub() virtual ~TestDataStructuresSub()
{ } { }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (Deletion != why) if (Deletion != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -49,72 +48,61 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual PTestDataStructuresSubParent* AllocPTestDataStructuresSub(const int& i) MOZ_OVERRIDE
virtual PTestDataStructuresSubParent* AllocPTestDataStructuresSub(const int& i)
{ {
PTestDataStructuresSubParent* actor = new TestDataStructuresSub(i); PTestDataStructuresSubParent* actor = new TestDataStructuresSub(i);
mKids.AppendElement(actor); mKids.AppendElement(actor);
return actor; return actor;
} }
NS_OVERRIDE virtual bool DeallocPTestDataStructuresSub(PTestDataStructuresSubParent* actor) MOZ_OVERRIDE;
virtual bool DeallocPTestDataStructuresSub(PTestDataStructuresSubParent* actor);
NS_OVERRIDE
virtual bool RecvTest1( virtual bool RecvTest1(
const InfallibleTArray<int>& i1, const InfallibleTArray<int>& i1,
InfallibleTArray<int>* o1); InfallibleTArray<int>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest2( virtual bool RecvTest2(
const InfallibleTArray<PTestDataStructuresSubParent*>& i1, const InfallibleTArray<PTestDataStructuresSubParent*>& i1,
InfallibleTArray<PTestDataStructuresSubParent*>* o1); InfallibleTArray<PTestDataStructuresSubParent*>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest3( virtual bool RecvTest3(
const IntDouble& i1, const IntDouble& i1,
const IntDouble& i2, const IntDouble& i2,
IntDouble* o1, IntDouble* o1,
IntDouble* o2); IntDouble* o2) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest4( virtual bool RecvTest4(
const InfallibleTArray<IntDouble>& i1, const InfallibleTArray<IntDouble>& i1,
InfallibleTArray<IntDouble>* o1); InfallibleTArray<IntDouble>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest5( virtual bool RecvTest5(
const IntDoubleArrays& i1, const IntDoubleArrays& i1,
const IntDoubleArrays& i2, const IntDoubleArrays& i2,
const IntDoubleArrays& i3, const IntDoubleArrays& i3,
IntDoubleArrays* o1, IntDoubleArrays* o1,
IntDoubleArrays* o2, IntDoubleArrays* o2,
IntDoubleArrays* o3); IntDoubleArrays* o3) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest6( virtual bool RecvTest6(
const InfallibleTArray<IntDoubleArrays>& i1, const InfallibleTArray<IntDoubleArrays>& i1,
InfallibleTArray<IntDoubleArrays>* o1); InfallibleTArray<IntDoubleArrays>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest7_0(const ActorWrapper& i1, virtual bool RecvTest7_0(const ActorWrapper& i1,
ActorWrapper* o1); ActorWrapper* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest7( virtual bool RecvTest7(
const Actors& i1, const Actors& i1,
const Actors& i2, const Actors& i2,
const Actors& i3, const Actors& i3,
Actors* o1, Actors* o1,
Actors* o2, Actors* o2,
Actors* o3); Actors* o3) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest8( virtual bool RecvTest8(
const InfallibleTArray<Actors>& i1, const InfallibleTArray<Actors>& i1,
InfallibleTArray<Actors>* o1); InfallibleTArray<Actors>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest9( virtual bool RecvTest9(
const Unions& i1, const Unions& i1,
const Unions& i2, const Unions& i2,
@@ -123,34 +111,28 @@ protected:
Unions* o1, Unions* o1,
Unions* o2, Unions* o2,
Unions* o3, Unions* o3,
Unions* o4); Unions* o4) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest10( virtual bool RecvTest10(
const InfallibleTArray<Unions>& i1, const InfallibleTArray<Unions>& i1,
InfallibleTArray<Unions>* o1); InfallibleTArray<Unions>* o1) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest11( virtual bool RecvTest11(
const SIntDouble& i, const SIntDouble& i,
SIntDouble* o); SIntDouble* o) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest12( virtual bool RecvTest12(
const SIntDoubleArrays& i, const SIntDoubleArrays& i,
SIntDoubleArrays* o); SIntDoubleArrays* o) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest13( virtual bool RecvTest13(
const SActors& i, const SActors& i,
SActors* o); SActors* o) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest14( virtual bool RecvTest14(
const Structs& i, const Structs& i,
Structs* o); Structs* o) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest15( virtual bool RecvTest15(
const WithStructs& i1, const WithStructs& i1,
const WithStructs& i2, const WithStructs& i2,
@@ -161,28 +143,23 @@ protected:
WithStructs* o2, WithStructs* o2,
WithStructs* o3, WithStructs* o3,
WithStructs* o4, WithStructs* o4,
WithStructs* o5); WithStructs* o5) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvTest16( virtual bool RecvTest16(
const WithUnions& i, const WithUnions& i,
WithUnions* o); WithUnions* o) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvTest17(const InfallibleTArray<Op>& sa) MOZ_OVERRIDE;
virtual bool RecvTest17(const InfallibleTArray<Op>& sa);
NS_OVERRIDE virtual bool RecvTest18(const InfallibleTArray<nsIntRegion>& ra) MOZ_OVERRIDE;
virtual bool RecvTest18(const InfallibleTArray<nsIntRegion>& ra);
NS_OVERRIDE virtual bool RecvDummy(const ShmemUnion& su, ShmemUnion* rsu) MOZ_OVERRIDE
virtual bool RecvDummy(const ShmemUnion& su, ShmemUnion* rsu)
{ {
*rsu = su; *rsu = su;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -203,26 +180,22 @@ public:
virtual ~TestDataStructuresChild(); virtual ~TestDataStructuresChild();
protected: protected:
NS_OVERRIDE virtual PTestDataStructuresSubChild* AllocPTestDataStructuresSub(const int& i) MOZ_OVERRIDE
virtual PTestDataStructuresSubChild* AllocPTestDataStructuresSub(const int& i)
{ {
PTestDataStructuresSubChild* actor = new TestDataStructuresSub(i); PTestDataStructuresSubChild* actor = new TestDataStructuresSub(i);
mKids.AppendElement(actor); mKids.AppendElement(actor);
return actor; return actor;
} }
NS_OVERRIDE virtual bool DeallocPTestDataStructuresSub(PTestDataStructuresSubChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestDataStructuresSub(PTestDataStructuresSubChild* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

36
ipc/ipdl/test/cxx/TestDesc.h
View File

@@ -30,17 +30,13 @@ public:
void Main(); void Main();
NS_OVERRIDE virtual bool RecvOk(PTestDescSubsubParent* a) MOZ_OVERRIDE;
virtual bool RecvOk(PTestDescSubsubParent* a);
protected: protected:
NS_OVERRIDE virtual PTestDescSubParent* AllocPTestDescSub(PTestDescSubsubParent*) MOZ_OVERRIDE;
virtual PTestDescSubParent* AllocPTestDescSub(PTestDescSubsubParent*); virtual bool DeallocPTestDescSub(PTestDescSubParent* actor) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool DeallocPTestDescSub(PTestDescSubParent* actor);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -58,17 +54,13 @@ public:
virtual ~TestDescChild() { } virtual ~TestDescChild() { }
protected: protected:
NS_OVERRIDE virtual PTestDescSubChild* AllocPTestDescSub(PTestDescSubsubChild*) MOZ_OVERRIDE;
virtual PTestDescSubChild* AllocPTestDescSub(PTestDescSubsubChild*);
NS_OVERRIDE virtual bool DeallocPTestDescSub(PTestDescSubChild* actor) MOZ_OVERRIDE;
virtual bool DeallocPTestDescSub(PTestDescSubChild* actor);
NS_OVERRIDE virtual bool RecvTest(PTestDescSubsubChild* a) MOZ_OVERRIDE;
virtual bool RecvTest(PTestDescSubsubChild* a);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -88,11 +80,9 @@ public:
virtual ~TestDescSubParent() { } virtual ~TestDescSubParent() { }
protected: protected:
NS_OVERRIDE virtual PTestDescSubsubParent* AllocPTestDescSubsub() MOZ_OVERRIDE;
virtual PTestDescSubsubParent* AllocPTestDescSubsub();
NS_OVERRIDE virtual bool DeallocPTestDescSubsub(PTestDescSubsubParent* actor) MOZ_OVERRIDE;
virtual bool DeallocPTestDescSubsub(PTestDescSubsubParent* actor);
}; };
@@ -104,10 +94,8 @@ public:
virtual ~TestDescSubChild() { } virtual ~TestDescSubChild() { }
protected: protected:
NS_OVERRIDE virtual PTestDescSubsubChild* AllocPTestDescSubsub() MOZ_OVERRIDE;
virtual PTestDescSubsubChild* AllocPTestDescSubsub(); virtual bool DeallocPTestDescSubsub(PTestDescSubsubChild* actor) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool DeallocPTestDescSubsub(PTestDescSubsubChild* actor);
}; };

48
ipc/ipdl/test/cxx/TestFailedCtor.h
View File

@@ -35,13 +35,10 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual PTestFailedCtorSubParent* AllocPTestFailedCtorSub() MOZ_OVERRIDE;
virtual PTestFailedCtorSubParent* AllocPTestFailedCtorSub(); virtual bool DeallocPTestFailedCtorSub(PTestFailedCtorSubParent* actor) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool DeallocPTestFailedCtorSub(PTestFailedCtorSubParent* actor);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -59,20 +56,15 @@ public:
virtual ~TestFailedCtorChild() { } virtual ~TestFailedCtorChild() { }
protected: protected:
NS_OVERRIDE virtual PTestFailedCtorSubChild* AllocPTestFailedCtorSub() MOZ_OVERRIDE;
virtual PTestFailedCtorSubChild* AllocPTestFailedCtorSub();
NS_OVERRIDE virtual bool AnswerPTestFailedCtorSubConstructor(PTestFailedCtorSubChild* actor) MOZ_OVERRIDE;
virtual bool AnswerPTestFailedCtorSubConstructor(PTestFailedCtorSubChild* actor);
NS_OVERRIDE virtual bool DeallocPTestFailedCtorSub(PTestFailedCtorSubChild* actor) MOZ_OVERRIDE;
virtual bool DeallocPTestFailedCtorSub(PTestFailedCtorSubChild* actor);
NS_OVERRIDE virtual void ProcessingError(Result what) MOZ_OVERRIDE;
virtual void ProcessingError(Result what);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
fail("should have _exit()ed"); fail("should have _exit()ed");
} }
@@ -92,16 +84,12 @@ public:
virtual ~TestFailedCtorSubParent(); virtual ~TestFailedCtorSubParent();
protected: protected:
NS_OVERRIDE virtual PTestFailedCtorSubsubParent* AllocPTestFailedCtorSubsub() MOZ_OVERRIDE;
virtual PTestFailedCtorSubsubParent* AllocPTestFailedCtorSubsub();
NS_OVERRIDE virtual bool DeallocPTestFailedCtorSubsub(PTestFailedCtorSubsubParent* actor) MOZ_OVERRIDE;
virtual bool DeallocPTestFailedCtorSubsub(PTestFailedCtorSubsubParent* actor); virtual bool RecvSync() MOZ_OVERRIDE { return true; }
NS_OVERRIDE
virtual bool RecvSync() { return true; }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
TestFailedCtorSubsub* mOne; TestFailedCtorSubsub* mOne;
TestFailedCtorSubsub* mTwo; TestFailedCtorSubsub* mTwo;
@@ -117,13 +105,10 @@ public:
virtual ~TestFailedCtorSubChild() { } virtual ~TestFailedCtorSubChild() { }
protected: protected:
NS_OVERRIDE virtual PTestFailedCtorSubsubChild* AllocPTestFailedCtorSubsub() MOZ_OVERRIDE;
virtual PTestFailedCtorSubsubChild* AllocPTestFailedCtorSubsub(); virtual bool DeallocPTestFailedCtorSubsub(PTestFailedCtorSubsubChild* actor) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool DeallocPTestFailedCtorSubsub(PTestFailedCtorSubsubChild* actor);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
@@ -138,8 +123,7 @@ public:
TestFailedCtorSubsub() : mWhy(ActorDestroyReason(-1)), mDealloced(false) {} TestFailedCtorSubsub() : mWhy(ActorDestroyReason(-1)), mDealloced(false) {}
virtual ~TestFailedCtorSubsub() {} virtual ~TestFailedCtorSubsub() {}
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE { mWhy = why; }
virtual void ActorDestroy(ActorDestroyReason why) { mWhy = why; }
ActorDestroyReason mWhy; ActorDestroyReason mWhy;
bool mDealloced; bool mDealloced;

22
ipc/ipdl/test/cxx/TestHangs.h
View File

@@ -26,19 +26,15 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
virtual bool ShouldContinueFromReplyTimeout();
NS_OVERRIDE
virtual bool RecvNonce() { virtual bool RecvNonce() {
return true; return true;
} }
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -60,26 +56,22 @@ public:
virtual ~TestHangsChild(); virtual ~TestHangsChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE {
virtual bool RecvStart() {
if (!SendNonce()) if (!SendNonce())
fail("sending Nonce"); fail("sending Nonce");
return true; return true;
} }
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE
virtual bool AnswerStackFrame()
{ {
if (CallStackFrame()) if (CallStackFrame())
fail("should have failed"); fail("should have failed");
return true; return true;
} }
NS_OVERRIDE virtual bool AnswerHang() MOZ_OVERRIDE;
virtual bool AnswerHang();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

24
ipc/ipdl/test/cxx/TestJSON.h
View File

@@ -33,26 +33,22 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
RecvTest(const JSONVariant& i, RecvTest(const JSONVariant& i,
JSONVariant* o); JSONVariant* o) MOZ_OVERRIDE;
NS_OVERRIDE virtual PTestHandleParent* AllocPTestHandle() MOZ_OVERRIDE
virtual PTestHandleParent* AllocPTestHandle()
{ {
return mKid = new TestHandleParent(); return mKid = new TestHandleParent();
} }
NS_OVERRIDE virtual bool DeallocPTestHandle(PTestHandleParent* actor) MOZ_OVERRIDE
virtual bool DeallocPTestHandle(PTestHandleParent* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -80,25 +76,21 @@ public:
virtual ~TestJSONChild() { } virtual ~TestJSONChild() { }
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
RecvStart(); RecvStart() MOZ_OVERRIDE;
NS_OVERRIDE virtual PTestHandleChild* AllocPTestHandle() MOZ_OVERRIDE
virtual PTestHandleChild* AllocPTestHandle()
{ {
return mKid = new TestHandleChild(); return mKid = new TestHandleChild();
} }
NS_OVERRIDE virtual bool DeallocPTestHandle(PTestHandleChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestHandle(PTestHandleChild* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

27
ipc/ipdl/test/cxx/TestLatency.h
View File

@@ -31,13 +31,10 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvPong() MOZ_OVERRIDE;
virtual bool RecvPong(); virtual bool RecvPong5() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvPong5();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -82,19 +79,13 @@ public:
virtual ~TestLatencyChild(); virtual ~TestLatencyChild();
protected: protected:
NS_OVERRIDE virtual bool RecvPing() MOZ_OVERRIDE;
virtual bool RecvPing(); virtual bool RecvPing5() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool AnswerRpc() MOZ_OVERRIDE;
virtual bool RecvPing5(); virtual bool RecvSpam() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool AnswerSynchro() MOZ_OVERRIDE;
virtual bool AnswerRpc();
NS_OVERRIDE
virtual bool RecvSpam();
NS_OVERRIDE
virtual bool AnswerSynchro();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

27
ipc/ipdl/test/cxx/TestManyChildAllocs.h
View File

@@ -27,15 +27,11 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvDone() MOZ_OVERRIDE;
virtual bool RecvDone(); virtual bool DeallocPTestManyChildAllocsSub(PTestManyChildAllocsSubParent* __a) MOZ_OVERRIDE;
NS_OVERRIDE virtual PTestManyChildAllocsSubParent* AllocPTestManyChildAllocsSub() MOZ_OVERRIDE;
virtual bool DeallocPTestManyChildAllocsSub(PTestManyChildAllocsSubParent* __a);
NS_OVERRIDE
virtual PTestManyChildAllocsSubParent* AllocPTestManyChildAllocsSub();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -53,15 +49,11 @@ public:
virtual ~TestManyChildAllocsChild(); virtual ~TestManyChildAllocsChild();
protected: protected:
NS_OVERRIDE virtual bool RecvGo() MOZ_OVERRIDE;
virtual bool RecvGo(); virtual bool DeallocPTestManyChildAllocsSub(PTestManyChildAllocsSubChild* __a) MOZ_OVERRIDE;
NS_OVERRIDE virtual PTestManyChildAllocsSubChild* AllocPTestManyChildAllocsSub() MOZ_OVERRIDE;
virtual bool DeallocPTestManyChildAllocsSub(PTestManyChildAllocsSubChild* __a);
NS_OVERRIDE
virtual PTestManyChildAllocsSubChild* AllocPTestManyChildAllocsSub();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -80,8 +72,7 @@ public:
virtual ~TestManyChildAllocsSubParent() { } virtual ~TestManyChildAllocsSubParent() { }
protected: protected:
NS_OVERRIDE virtual bool RecvHello() MOZ_OVERRIDE { return true; }
virtual bool RecvHello() { return true; }
}; };

66
ipc/ipdl/test/cxx/TestMultiMgrs.h
View File

@@ -40,14 +40,12 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottom() MOZ_OVERRIDE
virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottom()
{ {
return new TestMultiMgrsBottomParent(); return new TestMultiMgrsBottomParent();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomParent* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomParent* actor)
{ {
delete actor; delete actor;
return true; return true;
@@ -67,14 +65,12 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottom() MOZ_OVERRIDE
virtual PTestMultiMgrsBottomParent* AllocPTestMultiMgrsBottom()
{ {
return new TestMultiMgrsBottomParent(); return new TestMultiMgrsBottomParent();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomParent* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomParent* actor)
{ {
delete actor; delete actor;
return true; return true;
@@ -94,37 +90,31 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvOK() MOZ_OVERRIDE;
virtual bool RecvOK();
NS_OVERRIDE virtual PTestMultiMgrsLeftParent* AllocPTestMultiMgrsLeft() MOZ_OVERRIDE
virtual PTestMultiMgrsLeftParent* AllocPTestMultiMgrsLeft()
{ {
return new TestMultiMgrsLeftParent(); return new TestMultiMgrsLeftParent();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsLeft(PTestMultiMgrsLeftParent* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsLeft(PTestMultiMgrsLeftParent* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual PTestMultiMgrsRightParent* AllocPTestMultiMgrsRight() MOZ_OVERRIDE
virtual PTestMultiMgrsRightParent* AllocPTestMultiMgrsRight()
{ {
return new TestMultiMgrsRightParent(); return new TestMultiMgrsRightParent();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsRight(PTestMultiMgrsRightParent* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsRight(PTestMultiMgrsRightParent* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -158,17 +148,14 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual bool RecvPTestMultiMgrsBottomConstructor(PTestMultiMgrsBottomChild* actor) MOZ_OVERRIDE;
virtual bool RecvPTestMultiMgrsBottomConstructor(PTestMultiMgrsBottomChild* actor);
NS_OVERRIDE virtual PTestMultiMgrsBottomChild* AllocPTestMultiMgrsBottom() MOZ_OVERRIDE
virtual PTestMultiMgrsBottomChild* AllocPTestMultiMgrsBottom()
{ {
return new TestMultiMgrsBottomChild(); return new TestMultiMgrsBottomChild();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomChild* actor)
{ {
delete actor; delete actor;
return true; return true;
@@ -188,17 +175,14 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual bool RecvPTestMultiMgrsBottomConstructor(PTestMultiMgrsBottomChild* actor) MOZ_OVERRIDE;
virtual bool RecvPTestMultiMgrsBottomConstructor(PTestMultiMgrsBottomChild* actor);
NS_OVERRIDE virtual PTestMultiMgrsBottomChild* AllocPTestMultiMgrsBottom() MOZ_OVERRIDE
virtual PTestMultiMgrsBottomChild* AllocPTestMultiMgrsBottom()
{ {
return new TestMultiMgrsBottomChild(); return new TestMultiMgrsBottomChild();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsBottom(PTestMultiMgrsBottomChild* actor)
{ {
delete actor; delete actor;
return true; return true;
@@ -218,37 +202,31 @@ public:
PTestMultiMgrsBottomChild* mBottomR; PTestMultiMgrsBottomChild* mBottomR;
protected: protected:
NS_OVERRIDE virtual bool RecvCheck() MOZ_OVERRIDE;
virtual bool RecvCheck();
NS_OVERRIDE virtual PTestMultiMgrsLeftChild* AllocPTestMultiMgrsLeft() MOZ_OVERRIDE
virtual PTestMultiMgrsLeftChild* AllocPTestMultiMgrsLeft()
{ {
return new TestMultiMgrsLeftChild(); return new TestMultiMgrsLeftChild();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsLeft(PTestMultiMgrsLeftChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsLeft(PTestMultiMgrsLeftChild* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual PTestMultiMgrsRightChild* AllocPTestMultiMgrsRight() MOZ_OVERRIDE
virtual PTestMultiMgrsRightChild* AllocPTestMultiMgrsRight()
{ {
return new TestMultiMgrsRightChild(); return new TestMultiMgrsRightChild();
} }
NS_OVERRIDE virtual bool DeallocPTestMultiMgrsRight(PTestMultiMgrsRightChild* actor) MOZ_OVERRIDE
virtual bool DeallocPTestMultiMgrsRight(PTestMultiMgrsRightChild* actor)
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

15
ipc/ipdl/test/cxx/TestNestedLoops.h
View File

@@ -23,13 +23,11 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvNonce() MOZ_OVERRIDE;
virtual bool RecvNonce();
void BreakNestedLoop(); void BreakNestedLoop();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -49,14 +47,11 @@ public:
virtual ~TestNestedLoopsChild(); virtual ~TestNestedLoopsChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool AnswerR() MOZ_OVERRIDE;
virtual bool AnswerR();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

36
ipc/ipdl/test/cxx/TestOpens.h
View File

@@ -27,12 +27,10 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual PTestOpensOpenedParent* virtual PTestOpensOpenedParent*
AllocPTestOpensOpened(Transport* transport, ProcessId otherProcess); AllocPTestOpensOpened(Transport* transport, ProcessId otherProcess) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
} // namespace _ipdltest } // namespace _ipdltest
@@ -48,15 +46,11 @@ public:
virtual ~TestOpensOpenedParent() {} virtual ~TestOpensOpenedParent() {}
protected: protected:
NS_OVERRIDE virtual bool RecvHello() MOZ_OVERRIDE;
virtual bool RecvHello(); virtual bool RecvHelloSync() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool AnswerHelloRpc() MOZ_OVERRIDE;
virtual bool RecvHelloSync();
NS_OVERRIDE
virtual bool AnswerHelloRpc();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
Transport* mTransport; Transport* mTransport;
}; };
@@ -74,15 +68,12 @@ public:
virtual ~TestOpensChild() {} virtual ~TestOpensChild() {}
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE
virtual PTestOpensOpenedChild* virtual PTestOpensOpenedChild*
AllocPTestOpensOpened(Transport* transport, ProcessId otherProcess); AllocPTestOpensOpened(Transport* transport, ProcessId otherProcess) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
}; };
} // namespace _ipdltest } // namespace _ipdltest
@@ -99,13 +90,10 @@ public:
virtual ~TestOpensOpenedChild() {} virtual ~TestOpensOpenedChild() {}
protected: protected:
NS_OVERRIDE virtual bool RecvHi() MOZ_OVERRIDE;
virtual bool RecvHi(); virtual bool AnswerHiRpc() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool AnswerHiRpc();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason why);
bool mGotHi; bool mGotHi;
Transport* mTransport; Transport* mTransport;

12
ipc/ipdl/test/cxx/TestRPCErrorCleanup.h
View File

@@ -24,15 +24,13 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
} }
NS_OVERRIDE virtual void ProcessingError(Result what) MOZ_OVERRIDE;
virtual void ProcessingError(Result what);
bool mGotProcessingError; bool mGotProcessingError;
}; };
@@ -46,11 +44,9 @@ public:
virtual ~TestRPCErrorCleanupChild(); virtual ~TestRPCErrorCleanupChild();
protected: protected:
NS_OVERRIDE virtual bool AnswerError() MOZ_OVERRIDE;
virtual bool AnswerError();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
fail("should have 'crashed'!"); fail("should have 'crashed'!");
} }

51
ipc/ipdl/test/cxx/TestRPCRaces.h
View File

@@ -29,39 +29,31 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
RecvStartRace(); RecvStartRace() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerRace(bool* hasRace); AnswerRace(bool* hasRace) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerStackFrame(); AnswerStackFrame() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerStackFrame3(); AnswerStackFrame3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerParent(); AnswerParent() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
RecvGetAnsweredParent(bool* answeredParent); RecvGetAnsweredParent(bool* answeredParent) MOZ_OVERRIDE;
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child) MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE
{ {
return MediateRace(parent, child); return MediateRace(parent, child);
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -91,43 +83,34 @@ public:
virtual ~TestRPCRacesChild() { } virtual ~TestRPCRacesChild() { }
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
RecvStart(); RecvStart() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerRace(bool* hasRace); AnswerRace(bool* hasRace) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerStackFrame(); AnswerStackFrame() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerStackFrame3(); AnswerStackFrame3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
RecvWakeup(); RecvWakeup() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
RecvWakeup3(); RecvWakeup3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool virtual bool
AnswerChild(); AnswerChild() MOZ_OVERRIDE;
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child) MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE
{ {
return MediateRace(parent, child); return MediateRace(parent, child);
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

18
ipc/ipdl/test/cxx/TestRPCShutdownRace.h
View File

@@ -23,17 +23,14 @@ public:
void Main(); void Main();
NS_OVERRIDE virtual bool RecvStartDeath() MOZ_OVERRIDE;
virtual bool RecvStartDeath();
NS_OVERRIDE virtual bool RecvOrphan() MOZ_OVERRIDE;
virtual bool RecvOrphan();
protected: protected:
void StartShuttingDown(); void StartShuttingDown();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (AbnormalShutdown != why) if (AbnormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -49,14 +46,11 @@ public:
virtual ~TestRPCShutdownRaceChild(); virtual ~TestRPCShutdownRaceChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool AnswerExit() MOZ_OVERRIDE;
virtual bool AnswerExit();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
fail("should have 'crashed'!"); fail("should have 'crashed'!");
} }

24
ipc/ipdl/test/cxx/TestRaceDeferral.h
View File

@@ -24,15 +24,12 @@ public:
protected: protected:
void Test1(); void Test1();
NS_OVERRIDE virtual bool AnswerLose() MOZ_OVERRIDE;
virtual bool AnswerLose();
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child); MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -52,21 +49,16 @@ public:
virtual ~TestRaceDeferralChild(); virtual ~TestRaceDeferralChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStartRace() MOZ_OVERRIDE;
virtual bool RecvStartRace();
NS_OVERRIDE virtual bool AnswerWin() MOZ_OVERRIDE;
virtual bool AnswerWin();
NS_OVERRIDE virtual bool AnswerRpc() MOZ_OVERRIDE;
virtual bool AnswerRpc();
NS_OVERRIDE
virtual mozilla::ipc::RPCChannel::RacyRPCPolicy virtual mozilla::ipc::RPCChannel::RacyRPCPolicy
MediateRPCRace(const Message& parent, const Message& child); MediateRPCRace(const Message& parent, const Message& child) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

21
ipc/ipdl/test/cxx/TestRacyRPCReplies.h
View File

@@ -23,14 +23,11 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvA_() MOZ_OVERRIDE;
virtual bool RecvA_();
NS_OVERRIDE virtual bool Answer_R(int* replyNum) MOZ_OVERRIDE;
virtual bool Answer_R(int* replyNum);
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -51,17 +48,13 @@ public:
virtual ~TestRacyRPCRepliesChild(); virtual ~TestRacyRPCRepliesChild();
protected: protected:
NS_OVERRIDE virtual bool AnswerR_(int* replyNum) MOZ_OVERRIDE;
virtual bool AnswerR_(int* replyNum);
NS_OVERRIDE virtual bool RecvChildTest() MOZ_OVERRIDE;
virtual bool RecvChildTest();
NS_OVERRIDE virtual bool Recv_A() MOZ_OVERRIDE;
virtual bool Recv_A();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

18
ipc/ipdl/test/cxx/TestRacyReentry.h
View File

@@ -23,11 +23,9 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool AnswerE() MOZ_OVERRIDE;
virtual bool AnswerE();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -47,17 +45,13 @@ public:
virtual ~TestRacyReentryChild(); virtual ~TestRacyReentryChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool RecvN() MOZ_OVERRIDE;
virtual bool RecvN();
NS_OVERRIDE virtual bool AnswerH() MOZ_OVERRIDE;
virtual bool AnswerH();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

27
ipc/ipdl/test/cxx/TestRacyUndefer.h
View File

@@ -23,17 +23,13 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool AnswerSpam() MOZ_OVERRIDE;
virtual bool AnswerSpam();
NS_OVERRIDE virtual bool AnswerRaceWinTwice() MOZ_OVERRIDE;
virtual bool AnswerRaceWinTwice();
NS_OVERRIDE virtual bool RecvDone() MOZ_OVERRIDE;
virtual bool RecvDone();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -51,19 +47,14 @@ public:
virtual ~TestRacyUndeferChild(); virtual ~TestRacyUndeferChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool RecvAwakenSpam() MOZ_OVERRIDE;
virtual bool RecvAwakenSpam(); virtual bool RecvAwakenRaceWinTwice() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool RecvAwakenRaceWinTwice();
NS_OVERRIDE virtual bool AnswerRace() MOZ_OVERRIDE;
virtual bool AnswerRace();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

12
ipc/ipdl/test/cxx/TestSanity.h
View File

@@ -23,12 +23,10 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual bool RecvPong(const int& one, const float& zeroPtTwoFive, virtual bool RecvPong(const int& one, const float& zeroPtTwoFive,
const PRUint8& dummy); const PRUint8& dummy) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -46,12 +44,10 @@ public:
virtual ~TestSanityChild(); virtual ~TestSanityChild();
protected: protected:
NS_OVERRIDE
virtual bool RecvPing(const int& zero, const float& zeroPtFive, virtual bool RecvPing(const int& zero, const float& zeroPtFive,
const PRInt8& dummy); const PRInt8& dummy) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

36
ipc/ipdl/test/cxx/TestSelfManageRoot.h
View File

@@ -29,18 +29,15 @@ public:
ActorDestroyReason mWhy; ActorDestroyReason mWhy;
protected: protected:
NS_OVERRIDE virtual PTestSelfManageParent* AllocPTestSelfManage() MOZ_OVERRIDE {
virtual PTestSelfManageParent* AllocPTestSelfManage() {
return new TestSelfManageParent(); return new TestSelfManageParent();
} }
NS_OVERRIDE virtual bool DeallocPTestSelfManage(PTestSelfManageParent* a) MOZ_OVERRIDE {
virtual bool DeallocPTestSelfManage(PTestSelfManageParent* a) {
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE {
virtual void ActorDestroy(ActorDestroyReason why) {
mWhy = why; mWhy = why;
} }
}; };
@@ -62,18 +59,15 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual PTestSelfManageParent* AllocPTestSelfManage() MOZ_OVERRIDE {
virtual PTestSelfManageParent* AllocPTestSelfManage() {
return new TestSelfManageParent(); return new TestSelfManageParent();
} }
NS_OVERRIDE virtual bool DeallocPTestSelfManage(PTestSelfManageParent* a) MOZ_OVERRIDE {
virtual bool DeallocPTestSelfManage(PTestSelfManageParent* a) {
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -97,19 +91,16 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual PTestSelfManageChild* AllocPTestSelfManage() MOZ_OVERRIDE {
virtual PTestSelfManageChild* AllocPTestSelfManage() {
return new TestSelfManageChild(); return new TestSelfManageChild();
} }
NS_OVERRIDE virtual bool DeallocPTestSelfManage(PTestSelfManageChild* a) MOZ_OVERRIDE {
virtual bool DeallocPTestSelfManage(PTestSelfManageChild* a) {
delete a; delete a;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE { }
virtual void ActorDestroy(ActorDestroyReason why) { }
}; };
class TestSelfManageRootChild : class TestSelfManageRootChild :
@@ -126,19 +117,16 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual PTestSelfManageChild* AllocPTestSelfManage() MOZ_OVERRIDE {
virtual PTestSelfManageChild* AllocPTestSelfManage() {
return new TestSelfManageChild(); return new TestSelfManageChild();
} }
NS_OVERRIDE virtual bool DeallocPTestSelfManage(PTestSelfManageChild* a) MOZ_OVERRIDE {
virtual bool DeallocPTestSelfManage(PTestSelfManageChild* a) {
delete a; delete a;
return true; return true;
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

12
ipc/ipdl/test/cxx/TestShmem.h
View File

@@ -23,14 +23,12 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual bool RecvTake( virtual bool RecvTake(
Shmem& mem, Shmem& mem,
Shmem& unsafe, Shmem& unsafe,
const size_t& expectedSize); const size_t& expectedSize) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -48,14 +46,12 @@ public:
virtual ~TestShmemChild() { } virtual ~TestShmemChild() { }
protected: protected:
NS_OVERRIDE
virtual bool RecvGive( virtual bool RecvGive(
Shmem& mem, Shmem& mem,
Shmem& unsafe, Shmem& unsafe,
const size_t& expectedSize); const size_t& expectedSize) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

51
ipc/ipdl/test/cxx/TestShutdown.h
View File

@@ -32,9 +32,8 @@ public:
} }
protected: protected:
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
private: private:
bool mExpectParentDeleted; bool mExpectParentDeleted;
@@ -58,32 +57,28 @@ public:
} }
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
AnswerStackFrame() AnswerStackFrame() MOZ_OVERRIDE
{ {
return CallStackFrame(); return CallStackFrame();
} }
NS_OVERRIDE
virtual PTestShutdownSubsubParent* virtual PTestShutdownSubsubParent*
AllocPTestShutdownSubsub(const bool& expectParentDelete) AllocPTestShutdownSubsub(const bool& expectParentDelete) MOZ_OVERRIDE
{ {
return new TestShutdownSubsubParent(expectParentDelete); return new TestShutdownSubsubParent(expectParentDelete);
} }
NS_OVERRIDE
virtual bool virtual bool
DeallocPTestShutdownSubsub(PTestShutdownSubsubParent* actor) DeallocPTestShutdownSubsub(PTestShutdownSubsubParent* actor) MOZ_OVERRIDE
{ {
delete actor; delete actor;
++mDeletedCount; ++mDeletedCount;
return true; return true;
} }
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
private: private:
bool mExpectCrash; bool mExpectCrash;
@@ -109,26 +104,23 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvSync() { return true; } virtual bool RecvSync() MOZ_OVERRIDE { return true; }
NS_OVERRIDE
virtual PTestShutdownSubParent* virtual PTestShutdownSubParent*
AllocPTestShutdownSub(const bool& expectCrash) AllocPTestShutdownSub(const bool& expectCrash) MOZ_OVERRIDE
{ {
return new TestShutdownSubParent(expectCrash); return new TestShutdownSubParent(expectCrash);
} }
NS_OVERRIDE
virtual bool virtual bool
DeallocPTestShutdownSub(PTestShutdownSubParent* actor) DeallocPTestShutdownSub(PTestShutdownSubParent* actor) MOZ_OVERRIDE
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
}; };
@@ -148,9 +140,8 @@ public:
} }
protected: protected:
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
private: private:
bool mExpectParentDeleted; bool mExpectParentDeleted;
@@ -170,27 +161,23 @@ public:
} }
protected: protected:
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE
virtual PTestShutdownSubsubChild* virtual PTestShutdownSubsubChild*
AllocPTestShutdownSubsub(const bool& expectParentDelete) AllocPTestShutdownSubsub(const bool& expectParentDelete) MOZ_OVERRIDE
{ {
return new TestShutdownSubsubChild(expectParentDelete); return new TestShutdownSubsubChild(expectParentDelete);
} }
NS_OVERRIDE
virtual bool virtual bool
DeallocPTestShutdownSubsub(PTestShutdownSubsubChild* actor) DeallocPTestShutdownSubsub(PTestShutdownSubsubChild* actor) MOZ_OVERRIDE
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
private: private:
bool mExpectCrash; bool mExpectCrash;
@@ -209,29 +196,25 @@ public:
} }
protected: protected:
NS_OVERRIDE
virtual bool virtual bool
RecvStart(); RecvStart();
NS_OVERRIDE
virtual PTestShutdownSubChild* virtual PTestShutdownSubChild*
AllocPTestShutdownSub( AllocPTestShutdownSub(
const bool& expectCrash) const bool& expectCrash) MOZ_OVERRIDE
{ {
return new TestShutdownSubChild(expectCrash); return new TestShutdownSubChild(expectCrash);
} }
NS_OVERRIDE
virtual bool virtual bool
DeallocPTestShutdownSub(PTestShutdownSubChild* actor) DeallocPTestShutdownSub(PTestShutdownSubChild* actor) MOZ_OVERRIDE
{ {
delete actor; delete actor;
return true; return true;
} }
NS_OVERRIDE
virtual void virtual void
ActorDestroy(ActorDestroyReason why); ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
}; };

48
ipc/ipdl/test/cxx/TestStackHooks.h
View File

@@ -23,32 +23,27 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvAsync() MOZ_OVERRIDE {
virtual bool RecvAsync() {
if (!mOnStack) if (!mOnStack)
fail("not on C++ stack?!"); fail("not on C++ stack?!");
return true; return true;
} }
NS_OVERRIDE virtual bool RecvSync() MOZ_OVERRIDE {
virtual bool RecvSync() {
if (!mOnStack) if (!mOnStack)
fail("not on C++ stack?!"); fail("not on C++ stack?!");
return true; return true;
} }
NS_OVERRIDE virtual bool AnswerRpc() MOZ_OVERRIDE {
virtual bool AnswerRpc() {
if (!mOnStack) if (!mOnStack)
fail("not on C++ stack?!"); fail("not on C++ stack?!");
return true; return true;
} }
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -56,21 +51,17 @@ protected:
QuitParent(); QuitParent();
} }
NS_OVERRIDE virtual void EnteredCxxStack() MOZ_OVERRIDE {
virtual void EnteredCxxStack() {
mOnStack = true; mOnStack = true;
} }
NS_OVERRIDE virtual void ExitedCxxStack() MOZ_OVERRIDE {
virtual void ExitedCxxStack() {
mOnStack = false; mOnStack = false;
} }
NS_OVERRIDE virtual void EnteredCall() MOZ_OVERRIDE {
virtual void EnteredCall() {
++mIncallDepth; ++mIncallDepth;
} }
NS_OVERRIDE virtual void ExitedCall() MOZ_OVERRIDE {
virtual void ExitedCall() {
--mIncallDepth; --mIncallDepth;
} }
@@ -90,14 +81,11 @@ public:
void RunTests(); void RunTests();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -111,23 +99,19 @@ protected:
QuitChild(); QuitChild();
} }
NS_OVERRIDE virtual void EnteredCxxStack() MOZ_OVERRIDE {
virtual void EnteredCxxStack() {
++mEntered; ++mEntered;
mOnStack = true; mOnStack = true;
} }
NS_OVERRIDE virtual void ExitedCxxStack() MOZ_OVERRIDE {
virtual void ExitedCxxStack() {
++mExited; ++mExited;
mOnStack = false; mOnStack = false;
} }
NS_OVERRIDE virtual void EnteredCall() MOZ_OVERRIDE {
virtual void EnteredCall() {
++mIncallDepth; ++mIncallDepth;
} }
NS_OVERRIDE virtual void ExitedCall() MOZ_OVERRIDE {
virtual void ExitedCall() {
--mIncallDepth; --mIncallDepth;
} }

18
ipc/ipdl/test/cxx/TestSyncError.h
View File

@@ -23,17 +23,14 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool RecvError() MOZ_OVERRIDE;
virtual bool RecvError();
NS_OVERRIDE virtual void ProcessingError(Result what) MOZ_OVERRIDE
virtual void ProcessingError(Result what)
{ {
// Ignore errors // Ignore errors
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -51,17 +48,14 @@ public:
virtual ~TestSyncErrorChild(); virtual ~TestSyncErrorChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual void ProcessingError(Result what) MOZ_OVERRIDE
virtual void ProcessingError(Result what)
{ {
// Ignore errors // Ignore errors
} }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

6
ipc/ipdl/test/cxx/TestSyncHang.h
View File

@@ -24,8 +24,7 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -43,8 +42,7 @@ public:
virtual ~TestSyncHangChild(); virtual ~TestSyncHangChild();
protected: protected:
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

27
ipc/ipdl/test/cxx/TestSyncWakeup.h
View File

@@ -23,17 +23,13 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual bool RecvSync1() MOZ_OVERRIDE;
virtual bool RecvSync1();
NS_OVERRIDE virtual bool RecvSync2() MOZ_OVERRIDE;
virtual bool RecvSync2();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -51,20 +47,15 @@ public:
virtual ~TestSyncWakeupChild(); virtual ~TestSyncWakeupChild();
protected: protected:
NS_OVERRIDE virtual bool RecvStart() MOZ_OVERRIDE;
virtual bool RecvStart();
NS_OVERRIDE virtual bool RecvNote1() MOZ_OVERRIDE;
virtual bool RecvNote1();
NS_OVERRIDE virtual bool AnswerStackFrame() MOZ_OVERRIDE;
virtual bool AnswerStackFrame();
NS_OVERRIDE virtual bool RecvNote2() MOZ_OVERRIDE;
virtual bool RecvNote2();
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

12
ipc/ipdl/test/cxx/TestSysVShmem.h
View File

@@ -23,14 +23,12 @@ public:
void Main(); void Main();
protected: protected:
NS_OVERRIDE
virtual bool RecvTake( virtual bool RecvTake(
Shmem& mem, Shmem& mem,
Shmem& unsafe, Shmem& unsafe,
const size_t& expectedSize); const size_t& expectedSize) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");
@@ -48,14 +46,12 @@ public:
virtual ~TestSysVShmemChild() { } virtual ~TestSysVShmemChild() { }
protected: protected:
NS_OVERRIDE
virtual bool RecvGive( virtual bool RecvGive(
Shmem& mem, Shmem& mem,
Shmem& unsafe, Shmem& unsafe,
const size_t& expectedSize); const size_t& expectedSize) MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
{ {
if (NormalShutdown != why) if (NormalShutdown != why)
fail("unexpected destruction!"); fail("unexpected destruction!");

6
layout/ipc/RenderFrameChild.h
View File

@@ -22,10 +22,8 @@ public:
void Destroy(); void Destroy();
protected: protected:
NS_OVERRIDE virtual PLayersChild* AllocPLayers() MOZ_OVERRIDE;
virtual PLayersChild* AllocPLayers(); virtual bool DeallocPLayers(PLayersChild* aLayers) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool DeallocPLayers(PLayersChild* aLayers);
}; };
} // namespace layout } // namespace layout

12
layout/ipc/RenderFrameParent.h
View File

@@ -163,16 +163,14 @@ public:
, mRemoteFrame(aRemoteFrame) , mRemoteFrame(aRemoteFrame)
{} {}
NS_OVERRIDE
virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder, virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
LayerManager* aManager, LayerManager* aManager,
const ContainerParameters& aParameters) const ContainerParameters& aParameters) MOZ_OVERRIDE
{ return mozilla::LAYER_ACTIVE_FORCE; } { return mozilla::LAYER_ACTIVE_FORCE; }
NS_OVERRIDE
virtual already_AddRefed<Layer> virtual already_AddRefed<Layer>
BuildLayer(nsDisplayListBuilder* aBuilder, LayerManager* aManager, BuildLayer(nsDisplayListBuilder* aBuilder, LayerManager* aManager,
const ContainerParameters& aContainerParameters); const ContainerParameters& aContainerParameters) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Remote", TYPE_REMOTE) NS_DISPLAY_DECL_NAME("Remote", TYPE_REMOTE)
@@ -202,7 +200,7 @@ public:
, mId(aId) , mId(aId)
{} {}
NS_OVERRIDE nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
{ {
*aSnap = false; *aSnap = false;
return mRect; return mRect;
@@ -214,8 +212,8 @@ public:
return 0; return 0;
} }
NS_OVERRIDE void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect, void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames); HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
NS_DISPLAY_DECL_NAME("Remote-Shadow", TYPE_REMOTE_SHADOW) NS_DISPLAY_DECL_NAME("Remote-Shadow", TYPE_REMOTE_SHADOW)

18
netwerk/protocol/ftp/FTPChannelChild.h
View File

@@ -61,24 +61,24 @@ public:
// default behavior, in order to be e10s-friendly. // default behavior, in order to be e10s-friendly.
NS_IMETHOD IsPending(bool* result); NS_IMETHOD IsPending(bool* result);
NS_OVERRIDE nsresult OpenContentStream(bool async, nsresult OpenContentStream(bool async,
nsIInputStream** stream, nsIInputStream** stream,
nsIChannel** channel); nsIChannel** channel) MOZ_OVERRIDE;
bool IsSuspended(); bool IsSuspended();
protected: protected:
NS_OVERRIDE bool RecvOnStartRequest(const PRInt32& aContentLength, bool RecvOnStartRequest(const PRInt32& aContentLength,
const nsCString& aContentType, const nsCString& aContentType,
const PRTime& aLastModified, const PRTime& aLastModified,
const nsCString& aEntityID, const nsCString& aEntityID,
const IPC::URI& aURI); const IPC::URI& aURI) MOZ_OVERRIDE;
NS_OVERRIDE bool RecvOnDataAvailable(const nsCString& data, bool RecvOnDataAvailable(const nsCString& data,
const PRUint32& offset, const PRUint32& offset,
const PRUint32& count); const PRUint32& count) MOZ_OVERRIDE;
NS_OVERRIDE bool RecvOnStopRequest(const nsresult& statusCode); bool RecvOnStopRequest(const nsresult& statusCode) MOZ_OVERRIDE;
NS_OVERRIDE bool RecvFailedAsyncOpen(const nsresult& statusCode); bool RecvFailedAsyncOpen(const nsresult& statusCode) MOZ_OVERRIDE;
NS_OVERRIDE bool RecvDeleteSelf(); bool RecvDeleteSelf() MOZ_OVERRIDE;
void DoOnStartRequest(const PRInt32& aContentLength, void DoOnStartRequest(const PRInt32& aContentLength,
const nsCString& aContentType, const nsCString& aContentType,

14
netwerk/protocol/ftp/FTPChannelParent.h
View File

@@ -36,7 +36,7 @@ public:
virtual ~FTPChannelParent(); virtual ~FTPChannelParent();
protected: protected:
NS_OVERRIDE virtual bool RecvAsyncOpen(const IPC::URI& uri, virtual bool RecvAsyncOpen(const IPC::URI& uri,
const PRUint64& startPos, const PRUint64& startPos,
const nsCString& entityID, const nsCString& entityID,
const IPC::InputStream& uploadStream, const IPC::InputStream& uploadStream,
@@ -45,13 +45,13 @@ protected:
const bool& usingPrivateBrowsing, const bool& usingPrivateBrowsing,
const bool& isInBrowserElement, const bool& isInBrowserElement,
const PRUint32& appId, const PRUint32& appId,
const nsCString& extendedOrigin); const nsCString& extendedOrigin) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvConnectChannel(const PRUint32& channelId); virtual bool RecvConnectChannel(const PRUint32& channelId) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvCancel(const nsresult& status); virtual bool RecvCancel(const nsresult& status) MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvSuspend(); virtual bool RecvSuspend() MOZ_OVERRIDE;
NS_OVERRIDE virtual bool RecvResume(); virtual bool RecvResume() MOZ_OVERRIDE;
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why); virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
nsRefPtr<nsFtpChannel> mChannel; nsRefPtr<nsFtpChannel> mChannel;

2
xpcom/base/nscore.h
View File

@@ -450,13 +450,11 @@ typedef PRUint32 nsrefcnt;
# define NS_INPARAM __attribute__((user("NS_inparam"))) # define NS_INPARAM __attribute__((user("NS_inparam")))
# define NS_OUTPARAM __attribute__((user("NS_outparam"))) # define NS_OUTPARAM __attribute__((user("NS_outparam")))
# define NS_INOUTPARAM __attribute__((user("NS_inoutparam"))) # define NS_INOUTPARAM __attribute__((user("NS_inoutparam")))
# define NS_OVERRIDE __attribute__((user("NS_override")))
#else #else
# define NS_SCRIPTABLE # define NS_SCRIPTABLE
# define NS_INPARAM # define NS_INPARAM
# define NS_OUTPARAM # define NS_OUTPARAM
# define NS_INOUTPARAM # define NS_INOUTPARAM
# define NS_OVERRIDE
#endif #endif
/* /*

2
xpcom/components/nsNativeComponentLoader.h
View File

@@ -21,7 +21,7 @@ class nsNativeModuleLoader : public mozilla::ModuleLoader
nsNativeModuleLoader() {} nsNativeModuleLoader() {}
~nsNativeModuleLoader() {} ~nsNativeModuleLoader() {}
NS_OVERRIDE virtual const mozilla::Module* LoadModule(mozilla::FileLocation &aFile); virtual const mozilla::Module* LoadModule(mozilla::FileLocation &aFile) MOZ_OVERRIDE;
nsresult Init(); nsresult Init();

1
xpcom/tests/static-checker/override-global.cpp
View File

@@ -1 +0,0 @@
__attribute__((user("NS_override"))) int m();

16
xpcom/tests/static-checker/override-namespace-typedef.cpp
View File

@@ -1,16 +0,0 @@
#include "nscore.h"
namespace A {
namespace B {
namespace C {
struct Param {};
class Base {
virtual void f(const Param& p) {}
};
}}}
class Derived : public A::B::C::Base {
typedef A::B::C::Param P;
NS_OVERRIDE void f(const P& p) {}
};

21
xpcom/tests/static-checker/override-pass.cpp
View File

@@ -1,21 +0,0 @@
class A
{
int a(int, char*);
void c(char);
virtual void d(int) = 0;
};
class B : A
{
__attribute__((user("NS_override"))) int a(int, char*);
};
class C : B
{
__attribute__((user("NS_override"))) void c(char);
};
class D : A
{
__attribute__((user("NS_override"))) void d(int);
};

9
xpcom/tests/static-checker/override-signature.cpp
View File

@@ -1,9 +0,0 @@
class A
{
int m(int);
};
class B : A
{
__attribute__((user("NS_override"))) int m(void*);
};

9
xpcom/tests/static-checker/override-static.cpp
View File

@@ -1,9 +0,0 @@
class A
{
static int m();
};
class B : A
{
__attribute__((user("NS_override"))) static int m();
};

9
xpcom/tests/static-checker/override-virtual.cpp
View File

@@ -1,9 +0,0 @@
class A
{
int m();
};
class B : A
{
__attribute__((user("NS_override"))) virtual int m();
};