Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1117248 - Mark virtual overridden functions as MOZ_OVERRIDE in image/; r=jrmuizel

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-02 19:16:57 -05:00
parent 1937a85540
commit 4d845d4829
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/decoders/nsBMPDecoder.h
View File

@ -52,7 +52,7 @@ public:
virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
DecodeStrategy aStrategy) MOZ_OVERRIDE;
virtual void FinishInternal();
virtual void FinishInternal() MOZ_OVERRIDE;
private:

4
image/decoders/nsGIFDecoder2.h
View File

@ -28,8 +28,8 @@ public:
virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
DecodeStrategy aStrategy) MOZ_OVERRIDE;
virtual void FinishInternal();
virtual Telemetry::ID SpeedHistogram();
virtual void FinishInternal() MOZ_OVERRIDE;
virtual Telemetry::ID SpeedHistogram() MOZ_OVERRIDE;
private:
// These functions will be called when the decoder has a decoded row,

6
image/decoders/nsICODecoder.h
View File

@ -40,9 +40,9 @@ public:
virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
DecodeStrategy aStrategy) MOZ_OVERRIDE;
virtual void FinishInternal();
virtual bool NeedsNewFrame() const;
virtual nsresult AllocateFrame();
virtual void FinishInternal() MOZ_OVERRIDE;
virtual bool NeedsNewFrame() const MOZ_OVERRIDE;
virtual nsresult AllocateFrame() MOZ_OVERRIDE;
private:
// Writes to the contained decoder and sets the appropriate errors

6
image/decoders/nsJPEGDecoder.h
View File

@ -55,12 +55,12 @@ public:
nsJPEGDecoder(RasterImage& aImage, Decoder::DecodeStyle aDecodeStyle);
virtual ~nsJPEGDecoder();
virtual void InitInternal();
virtual void InitInternal() MOZ_OVERRIDE;
virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
DecodeStrategy aStrategy) MOZ_OVERRIDE;
virtual void FinishInternal();
virtual void FinishInternal() MOZ_OVERRIDE;
virtual Telemetry::ID SpeedHistogram();
virtual Telemetry::ID SpeedHistogram() MOZ_OVERRIDE;
void NotifyDone();
protected:

4
image/decoders/nsPNGDecoder.h
View File

@ -27,10 +27,10 @@ public:
explicit nsPNGDecoder(RasterImage& aImage);
virtual ~nsPNGDecoder();
virtual void InitInternal();
virtual void InitInternal() MOZ_OVERRIDE;
virtual void WriteInternal(const char* aBuffer, uint32_t aCount,
DecodeStrategy aStrategy) MOZ_OVERRIDE;
virtual Telemetry::ID SpeedHistogram();
virtual Telemetry::ID SpeedHistogram() MOZ_OVERRIDE;
void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
int32_t width, int32_t height,

12
image/src/RasterImage.h
View File

@ -153,12 +153,12 @@ public:
NS_DECL_IMGICONTAINERDEBUG
#endif
virtual nsresult StartAnimation();
virtual nsresult StopAnimation();
virtual nsresult StartAnimation() MOZ_OVERRIDE;
virtual nsresult StopAnimation() MOZ_OVERRIDE;
// Methods inherited from Image
nsresult Init(const char* aMimeType,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;
virtual void OnSurfaceDiscarded() MOZ_OVERRIDE;
@ -171,9 +171,9 @@ public:
/* The total number of frames in this image. */
uint32_t GetNumFrames() const;
virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const;
virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
virtual size_t SizeOfDecoded(gfxMemoryLocation aLocation,
MallocSizeOf aMallocSizeOf) const;
MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
/* Triggers discarding. */
void Discard();
@ -497,7 +497,7 @@ protected:
explicit RasterImage(ProgressTracker* aProgressTracker = nullptr,
ImageURL* aURI = nullptr);
bool ShouldAnimate();
bool ShouldAnimate() MOZ_OVERRIDE;
friend class ImageFactory;
};

2
image/src/ShutdownTracker.cpp
View File

@ -31,7 +31,7 @@ struct ShutdownObserver : public nsIObserver
{
NS_DECL_ISUPPORTS
NS_IMETHOD Observe(nsISupports*, const char* aTopic, const char16_t*)
NS_IMETHOD Observe(nsISupports*, const char* aTopic, const char16_t*) MOZ_OVERRIDE
{
if (strcmp(aTopic, "xpcom-shutdown") != 0) {
return NS_OK;

8
image/src/VectorImage.h
View File

@ -39,7 +39,7 @@ public:
// Methods inherited from Image
nsresult Init(const char* aMimeType,
uint32_t aFlags);
uint32_t aFlags) MOZ_OVERRIDE;
virtual nsIntRect FrameRect(uint32_t aWhichFrame) MOZ_OVERRIDE;
virtual size_t SizeOfSourceWithComputedFallback(MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
@ -79,9 +79,9 @@ protected:
ImageURL* aURI = nullptr);
virtual ~VectorImage();
virtual nsresult StartAnimation();
virtual nsresult StopAnimation();
virtual bool ShouldAnimate();
virtual nsresult StartAnimation() MOZ_OVERRIDE;
virtual nsresult StopAnimation() MOZ_OVERRIDE;
virtual bool ShouldAnimate() MOZ_OVERRIDE;
void CreateSurfaceAndShow(const SVGDrawingParameters& aParams);
void Show(gfxDrawable* aDrawable, const SVGDrawingParameters& aParams);

2
image/src/imgLoader.cpp
View File

@ -59,7 +59,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
nsISupports* aData, bool aAnonymize)
nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
{
nsresult rv;
nsTArray<ImageMemoryCounter> chrome;