From 34ebbbebeb6da9d47c102b3ef9af846d0aca9e12 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Mon, 26 Jan 2015 21:09:59 -0500 Subject: [PATCH] Bug 1117034 - Mark some overridden functions in the tree as override --HG-- extra : rebase_source : a37ba6b69c02db90b8f3c440ac2dbca4d80c8bc5 --- dom/media/gstreamer/GStreamerReader.h | 16 ++++++++-------- dom/plugins/ipc/PluginModuleParent.h | 2 +- gfx/thebes/gfxPangoFonts.cpp | 8 ++++---- gfx/thebes/gfxPlatform.cpp | 2 +- js/src/jit/MIR.h | 4 ++-- toolkit/system/dbus/nsNetworkManagerListener.h | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dom/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h index 097a00658f8..832314b1baf 100644 --- a/dom/media/gstreamer/GStreamerReader.h +++ b/dom/media/gstreamer/GStreamerReader.h @@ -41,26 +41,26 @@ public: explicit GStreamerReader(AbstractMediaDecoder* aDecoder); virtual ~GStreamerReader(); - virtual nsresult Init(MediaDecoderReader* aCloneDonor); - virtual nsresult ResetDecode(); - virtual bool DecodeAudioData(); + virtual nsresult Init(MediaDecoderReader* aCloneDonor) MOZ_OVERRIDE; + virtual nsresult ResetDecode() MOZ_OVERRIDE; + virtual bool DecodeAudioData() MOZ_OVERRIDE; virtual bool DecodeVideoFrame(bool &aKeyframeSkip, - int64_t aTimeThreshold); + int64_t aTimeThreshold) MOZ_OVERRIDE; virtual nsresult ReadMetadata(MediaInfo* aInfo, - MetadataTags** aTags); + MetadataTags** aTags) MOZ_OVERRIDE; virtual nsRefPtr Seek(int64_t aTime, int64_t aEndTime) MOZ_OVERRIDE; - virtual nsresult GetBuffered(dom::TimeRanges* aBuffered); + virtual nsresult GetBuffered(dom::TimeRanges* aBuffered) MOZ_OVERRIDE; virtual void NotifyDataArrived(const char *aBuffer, uint32_t aLength, int64_t aOffset) MOZ_OVERRIDE; - virtual bool HasAudio() { + virtual bool HasAudio() MOZ_OVERRIDE { return mInfo.HasAudio(); } - virtual bool HasVideo() { + virtual bool HasVideo() MOZ_OVERRIDE { return mInfo.HasVideo(); } diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h index 88c79cf31ef..bbb99516b39 100644 --- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -231,7 +231,7 @@ protected: 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); + virtual nsresult NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error) MOZ_OVERRIDE; #else virtual nsresult NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error) MOZ_OVERRIDE; #endif diff --git a/gfx/thebes/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp index 9e8bd8328e4..e6f4ebaba74 100644 --- a/gfx/thebes/gfxPangoFonts.cpp +++ b/gfx/thebes/gfxPangoFonts.cpp @@ -205,8 +205,8 @@ public: cairo_font_face_destroy(mFontFace); } - virtual void ForgetHBFace(); - virtual void ReleaseGrFace(gr_face* aFace); + virtual void ForgetHBFace() MOZ_OVERRIDE; + virtual void ReleaseGrFace(gr_face* aFace) MOZ_OVERRIDE; protected: virtual nsresult @@ -671,12 +671,12 @@ public: // return a cloned font resized and offset to simulate sub/superscript glyphs virtual already_AddRefed - GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel); + GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel) MOZ_OVERRIDE; protected: virtual already_AddRefed MakeScaledFont(gfxFontStyle *aFontStyle, gfxFloat aFontScale); - virtual already_AddRefed GetSmallCapsFont(); + virtual already_AddRefed GetSmallCapsFont() MOZ_OVERRIDE; private: gfxFcFont(cairo_scaled_font_t *aCairoFont, gfxFcFontEntry *aFontEntry, diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 2454341c688..671eb52c855 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -169,7 +169,7 @@ public: explicit CrashStatsLogForwarder(const char* aKey); virtual void Log(const std::string& aString) MOZ_OVERRIDE; - virtual std::vector > StringsVectorCopy(); + virtual std::vector > StringsVectorCopy() MOZ_OVERRIDE; void SetCircularBufferSize(uint32_t aCapacity); diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 8d64878d13e..ea98d9d7791 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -4794,8 +4794,8 @@ class MTruncateToInt32 } #endif - bool writeRecoverData(CompactBufferWriter &writer) const; - bool canRecoverOnBailout() const { + bool writeRecoverData(CompactBufferWriter &writer) const MOZ_OVERRIDE; + bool canRecoverOnBailout() const MOZ_OVERRIDE { return input()->type() < MIRType_Symbol; } diff --git a/toolkit/system/dbus/nsNetworkManagerListener.h b/toolkit/system/dbus/nsNetworkManagerListener.h index 4afda1a9fa8..a1a83282870 100644 --- a/toolkit/system/dbus/nsNetworkManagerListener.h +++ b/toolkit/system/dbus/nsNetworkManagerListener.h @@ -20,9 +20,9 @@ public: nsresult Init(); - virtual void RegisterWithConnection(DBusConnection* connection); - virtual void UnregisterWithConnection(DBusConnection* connection); - virtual bool HandleMessage(DBusMessage* msg); + virtual void RegisterWithConnection(DBusConnection* connection) MOZ_OVERRIDE; + virtual void UnregisterWithConnection(DBusConnection* connection) MOZ_OVERRIDE; + virtual bool HandleMessage(DBusMessage* msg) MOZ_OVERRIDE; /** * This gets called when NetworkManager sends us a StateChange signal,