wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1117034 - Mark some overridden functions in the tree as override

Browse Source 
--HG--
extra : rebase_source : a37ba6b69c02db90b8f3c440ac2dbca4d80c8bc5
This commit is contained in:
Ehsan Akhgari 2015-01-26 21:09:59 -05:00
parent f1a11bd3a0
commit 34ebbbebeb
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/media/gstreamer/GStreamerReader.h
View File

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

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

@ -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

8
gfx/thebes/gfxPangoFonts.cpp
View File

@ -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<gfxFont>
GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel);
GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel) MOZ_OVERRIDE;
protected:
virtual already_AddRefed<gfxFont> MakeScaledFont(gfxFontStyle *aFontStyle,
gfxFloat aFontScale);
virtual already_AddRefed<gfxFont> GetSmallCapsFont();
virtual already_AddRefed<gfxFont> GetSmallCapsFont() MOZ_OVERRIDE;
private:
gfxFcFont(cairo_scaled_font_t *aCairoFont, gfxFcFontEntry *aFontEntry,

2
gfx/thebes/gfxPlatform.cpp
View File

@ -169,7 +169,7 @@ public:
explicit CrashStatsLogForwarder(const char* aKey);
virtual void Log(const std::string& aString) MOZ_OVERRIDE;
virtual std::vector<std::pair<int32_t,std::string> > StringsVectorCopy();
virtual std::vector<std::pair<int32_t,std::string> > StringsVectorCopy() MOZ_OVERRIDE;
void SetCircularBufferSize(uint32_t aCapacity);

4
js/src/jit/MIR.h
View File

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

6
toolkit/system/dbus/nsNetworkManagerListener.h
View File

@ -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,