Bug 702877 - Replace NS_OVERRIDE with MOZ_OVERRIDE. r=ehsan

--HG--
extra : rebase_source : 1843575683c3897f96f3966cbce26140ff1a7d90
This commit is contained in:
Joshua Cranmer 2012-07-06 13:15:45 -05:00
Родитель 6f2dea22ee
Коммит d539846cab
78 изменённых файлов: 644 добавлений и 1059 удалений

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -112,18 +112,15 @@ public:
virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window);
virtual nsresult GetImageContainer(NPP instance, ImageContainer** aContainer);
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)
virtual nsresult IsRemoteDrawingCoreAnimation(NPP instance, bool *aDrawing);
#endif
NS_OVERRIDE
virtual nsresult SetBackgroundUnknown(NPP instance);
NS_OVERRIDE
virtual nsresult SetBackgroundUnknown(NPP instance) MOZ_OVERRIDE;
virtual nsresult BeginUpdateBackground(NPP instance,
const nsIntRect&, gfxContext** aCtx);
NS_OVERRIDE
const nsIntRect&, gfxContext** aCtx) MOZ_OVERRIDE;
virtual nsresult EndUpdateBackground(NPP instance,
gfxContext* aCtx, const nsIntRect&);
gfxContext* aCtx, const nsIntRect&) MOZ_OVERRIDE;
#if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
virtual nsresult HandleGUIEvent(NPP instance,
const nsGUIEvent& anEvent, bool* handled);

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -24,7 +24,7 @@ public:
const nsCString& target, NPError* result);
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);

Просмотреть файл

@ -26,7 +26,7 @@ public:
, mBrowserStream(NULL)
{ }
NS_OVERRIDE virtual void ActorDestroy(ActorDestroyReason why);
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
void SetValid(void* aClosure) {
mClosure = aClosure;
@ -35,7 +35,7 @@ public:
void NPP_URLNotify(NPReason reason);
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);

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -29,39 +29,31 @@ public:
void Main();
protected:
NS_OVERRIDE
virtual bool
RecvStartRace();
RecvStartRace() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerRace(bool* hasRace);
AnswerRace(bool* hasRace) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerStackFrame();
AnswerStackFrame() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerStackFrame3();
AnswerStackFrame3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerParent();
AnswerParent() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
RecvGetAnsweredParent(bool* answeredParent);
RecvGetAnsweredParent(bool* answeredParent) MOZ_OVERRIDE;
NS_OVERRIDE
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);
}
NS_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
{
if (NormalShutdown != why)
fail("unexpected destruction!");
@ -91,43 +83,34 @@ public:
virtual ~TestRPCRacesChild() { }
protected:
NS_OVERRIDE
virtual bool
RecvStart();
RecvStart() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerRace(bool* hasRace);
AnswerRace(bool* hasRace) MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerStackFrame();
AnswerStackFrame() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerStackFrame3();
AnswerStackFrame3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
RecvWakeup();
RecvWakeup() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
RecvWakeup3();
RecvWakeup3() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool
AnswerChild();
AnswerChild() MOZ_OVERRIDE;
NS_OVERRIDE
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);
}
NS_OVERRIDE
virtual void ActorDestroy(ActorDestroyReason why)
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
{
if (NormalShutdown != why)
fail("unexpected destruction!");

Просмотреть файл

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

Просмотреть файл

@ -24,15 +24,12 @@ public:
protected:
void Test1();
NS_OVERRIDE
virtual bool AnswerLose();
virtual bool AnswerLose() MOZ_OVERRIDE;
NS_OVERRIDE
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)
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
{
if (NormalShutdown != why)
fail("unexpected destruction!");
@ -52,21 +49,16 @@ public:
virtual ~TestRaceDeferralChild();
protected:
NS_OVERRIDE
virtual bool RecvStartRace();
virtual bool RecvStartRace() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool AnswerWin();
virtual bool AnswerWin() MOZ_OVERRIDE;
NS_OVERRIDE
virtual bool AnswerRpc();
virtual bool AnswerRpc() MOZ_OVERRIDE;
NS_OVERRIDE
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)
virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
{
if (NormalShutdown != why)
fail("unexpected destruction!");

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -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) {}
};

Просмотреть файл

@ -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);
};

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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