From 69814cc06dc7b19ea73c387e82c79b45715f6de3 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 6 Jan 2015 15:12:41 -0500 Subject: [PATCH] Bug 1118419 - Mark virtual overridden functions as MOZ_OVERRIDE in graphics; r=jrmuizel --- gfx/2d/DataSourceSurfaceWrapper.h | 2 +- gfx/2d/DrawTargetCG.h | 60 ++++++++-------- gfx/2d/DrawTargetCairo.h | 70 +++++++++---------- gfx/2d/DrawTargetDual.h | 56 +++++++-------- gfx/2d/DrawTargetRecording.cpp | 10 +-- gfx/2d/DrawTargetRecording.h | 60 ++++++++-------- gfx/2d/DrawTargetSkia.h | 60 ++++++++-------- gfx/2d/DrawTargetTiled.h | 58 +++++++-------- gfx/2d/FilterNodeSoftware.h | 48 ++++++------- gfx/gl/GLContextCGL.h | 2 +- gfx/gl/GLContextEGL.h | 2 +- gfx/gl/GfxTexturesReporter.h | 2 +- .../trunk/include/effects/SkLayerRasterizer.h | 2 +- gfx/skia/trunk/include/gpu/SkGpuDevice.h | 2 +- gfx/thebes/gfxASurface.cpp | 2 +- gfx/thebes/gfxFontInfoLoader.cpp | 4 +- gfx/thebes/gfxImageSurface.h | 4 +- gfx/thebes/gfxMacFont.h | 4 +- gfx/thebes/gfxMacPlatformFontList.h | 8 +-- gfx/thebes/gfxPlatformMac.h | 22 +++--- gfx/thebes/gfxReusableImageSurfaceWrapper.h | 2 +- .../gfxReusableSharedImageSurfaceWrapper.h | 2 +- gfx/thebes/gfxVR.cpp | 24 +++---- 23 files changed, 253 insertions(+), 253 deletions(-) diff --git a/gfx/2d/DataSourceSurfaceWrapper.h b/gfx/2d/DataSourceSurfaceWrapper.h index c49ee5759e5..50c6e420815 100644 --- a/gfx/2d/DataSourceSurfaceWrapper.h +++ b/gfx/2d/DataSourceSurfaceWrapper.h @@ -16,7 +16,7 @@ namespace gfx { class DataSourceSurfaceWrapper : public DataSourceSurface { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurfaceWrapper) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurfaceWrapper, MOZ_OVERRIDE) explicit DataSourceSurfaceWrapper(DataSourceSurface *aSurface) : mSurface(aSurface) {} diff --git a/gfx/2d/DrawTargetCG.h b/gfx/2d/DrawTargetCG.h index 143fed1cc90..36ac3b79873 100644 --- a/gfx/2d/DrawTargetCG.h +++ b/gfx/2d/DrawTargetCG.h @@ -94,7 +94,7 @@ SetStrokeOptions(CGContextRef cg, const StrokeOptions &aStrokeOptions) class GlyphRenderingOptionsCG : public GlyphRenderingOptions { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GlyphRenderingOptionsCG) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GlyphRenderingOptionsCG, MOZ_OVERRIDE) explicit GlyphRenderingOptionsCG(const Color &aFontSmoothingBackgroundColor) : mFontSmoothingBackgroundColor(aFontSmoothingBackgroundColor) @@ -111,33 +111,33 @@ private: class DrawTargetCG : public DrawTarget { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetCG) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetCG, MOZ_OVERRIDE) friend class BorrowedCGContext; friend class SourceSurfaceCGBitmapContext; DrawTargetCG(); virtual ~DrawTargetCG(); virtual DrawTargetType GetType() const MOZ_OVERRIDE; - virtual BackendType GetBackendType() const; - virtual TemporaryRef Snapshot(); + virtual BackendType GetBackendType() const MOZ_OVERRIDE; + virtual TemporaryRef Snapshot() MOZ_OVERRIDE; virtual void DrawSurface(SourceSurface *aSurface, const Rect &aDest, const Rect &aSource, const DrawSurfaceOptions &aSurfOptions = DrawSurfaceOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void FillRect(const Rect &aRect, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; //XXX: why do we take a reference to SurfaceFormat? @@ -146,40 +146,40 @@ public: bool Init(CGContextRef cgContext, const IntSize &aSize); // Flush if using IOSurface context - virtual void Flush(); + virtual void Flush() MOZ_OVERRIDE; - virtual void DrawSurfaceWithShadow(SourceSurface *, const Point &, const Color &, const Point &, Float, CompositionOp); - virtual void ClearRect(const Rect &); - virtual void CopySurface(SourceSurface *, const IntRect&, const IntPoint&); - virtual void StrokeRect(const Rect &, const Pattern &, const StrokeOptions&, const DrawOptions&); - virtual void StrokeLine(const Point &, const Point &, const Pattern &, const StrokeOptions &, const DrawOptions &); - virtual void Stroke(const Path *, const Pattern &, const StrokeOptions &, const DrawOptions &); - virtual void Fill(const Path *, const Pattern &, const DrawOptions &); - virtual void FillGlyphs(ScaledFont *, const GlyphBuffer&, const Pattern &, const DrawOptions &, const GlyphRenderingOptions *); + virtual void DrawSurfaceWithShadow(SourceSurface *, const Point &, const Color &, const Point &, Float, CompositionOp) MOZ_OVERRIDE; + virtual void ClearRect(const Rect &) MOZ_OVERRIDE; + virtual void CopySurface(SourceSurface *, const IntRect&, const IntPoint&) MOZ_OVERRIDE; + virtual void StrokeRect(const Rect &, const Pattern &, const StrokeOptions&, const DrawOptions&) MOZ_OVERRIDE; + virtual void StrokeLine(const Point &, const Point &, const Pattern &, const StrokeOptions &, const DrawOptions &) MOZ_OVERRIDE; + virtual void Stroke(const Path *, const Pattern &, const StrokeOptions &, const DrawOptions &) MOZ_OVERRIDE; + virtual void Fill(const Path *, const Pattern &, const DrawOptions &) MOZ_OVERRIDE; + virtual void FillGlyphs(ScaledFont *, const GlyphBuffer&, const Pattern &, const DrawOptions &, const GlyphRenderingOptions *) MOZ_OVERRIDE; virtual void Mask(const Pattern &aSource, const Pattern &aMask, - const DrawOptions &aOptions = DrawOptions()); - virtual void PushClip(const Path *); - virtual void PushClipRect(const Rect &aRect); - virtual void PopClip(); - virtual TemporaryRef CreateSourceSurfaceFromNativeSurface(const NativeSurface&) const { return nullptr;} - virtual TemporaryRef CreateSimilarDrawTarget(const IntSize &, SurfaceFormat) const; - virtual TemporaryRef CreatePathBuilder(FillRule) const; + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; + virtual void PushClip(const Path *) MOZ_OVERRIDE; + virtual void PushClipRect(const Rect &aRect) MOZ_OVERRIDE; + virtual void PopClip() MOZ_OVERRIDE; + virtual TemporaryRef CreateSourceSurfaceFromNativeSurface(const NativeSurface&) const MOZ_OVERRIDE { return nullptr;} + virtual TemporaryRef CreateSimilarDrawTarget(const IntSize &, SurfaceFormat) const MOZ_OVERRIDE; + virtual TemporaryRef CreatePathBuilder(FillRule) const MOZ_OVERRIDE; virtual TemporaryRef CreateGradientStops(GradientStop *, uint32_t, - ExtendMode aExtendMode = ExtendMode::CLAMP) const; - virtual TemporaryRef CreateFilter(FilterType aType); + ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE; + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE; - virtual void *GetNativeSurface(NativeSurfaceType); + virtual void *GetNativeSurface(NativeSurfaceType) MOZ_OVERRIDE; - virtual IntSize GetSize() { return mSize; } + virtual IntSize GetSize() MOZ_OVERRIDE { return mSize; } /* This is for creating good compatible surfaces */ virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const; - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const; + SurfaceFormat aFormat) const MOZ_OVERRIDE; + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE; CGContextRef GetCGContext() { return mCg; } diff --git a/gfx/2d/DrawTargetCairo.h b/gfx/2d/DrawTargetCairo.h index c4977841c73..b7776742eaf 100644 --- a/gfx/2d/DrawTargetCairo.h +++ b/gfx/2d/DrawTargetCairo.h @@ -52,116 +52,116 @@ class GradientStopsCairo : public GradientStops class DrawTargetCairo : public DrawTarget { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetCairo) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetCairo, MOZ_OVERRIDE) friend class BorrowedCairoContext; DrawTargetCairo(); virtual ~DrawTargetCairo(); virtual DrawTargetType GetType() const MOZ_OVERRIDE; - virtual BackendType GetBackendType() const { return BackendType::CAIRO; } - virtual TemporaryRef Snapshot(); - virtual IntSize GetSize(); + virtual BackendType GetBackendType() const MOZ_OVERRIDE { return BackendType::CAIRO; } + virtual TemporaryRef Snapshot() MOZ_OVERRIDE; + virtual IntSize GetSize() MOZ_OVERRIDE; - virtual void SetPermitSubpixelAA(bool aPermitSubpixelAA); + virtual void SetPermitSubpixelAA(bool aPermitSubpixelAA) MOZ_OVERRIDE; virtual bool LockBits(uint8_t** aData, IntSize* aSize, - int32_t* aStride, SurfaceFormat* aFormat); - virtual void ReleaseBits(uint8_t* aData); + int32_t* aStride, SurfaceFormat* aFormat) MOZ_OVERRIDE; + virtual void ReleaseBits(uint8_t* aData) MOZ_OVERRIDE; - virtual void Flush(); + virtual void Flush() MOZ_OVERRIDE; virtual void DrawSurface(SourceSurface *aSurface, const Rect &aDest, const Rect &aSource, const DrawSurfaceOptions &aSurfOptions = DrawSurfaceOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawSurfaceWithShadow(SourceSurface *aSurface, const Point &aDest, const Color &aColor, const Point &aOffset, Float aSigma, - CompositionOp aOperator); + CompositionOp aOperator) MOZ_OVERRIDE; - virtual void ClearRect(const Rect &aRect); + virtual void ClearRect(const Rect &aRect) MOZ_OVERRIDE; virtual void CopySurface(SourceSurface *aSurface, const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; virtual void CopyRect(const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; virtual void FillRect(const Rect &aRect, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeRect(const Rect &aRect, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeLine(const Point &aStart, const Point &aEnd, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Stroke(const Path *aPath, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Fill(const Path *aPath, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pattern &aPattern, const DrawOptions &aOptions, - const GlyphRenderingOptions *aRenderingOptions = nullptr); + const GlyphRenderingOptions *aRenderingOptions = nullptr) MOZ_OVERRIDE; virtual void Mask(const Pattern &aSource, const Pattern &aMask, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; - virtual void PushClip(const Path *aPath); - virtual void PushClipRect(const Rect &aRect); - virtual void PopClip(); + virtual void PushClip(const Path *aPath) MOZ_OVERRIDE; + virtual void PushClipRect(const Rect &aRect) MOZ_OVERRIDE; + virtual void PopClip() MOZ_OVERRIDE; - virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const; + virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const MOZ_OVERRIDE; virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const; - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const; + SurfaceFormat aFormat) const MOZ_OVERRIDE; + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE; virtual TemporaryRef - CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const; + CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const MOZ_OVERRIDE; virtual TemporaryRef - CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const; + CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const MOZ_OVERRIDE; virtual TemporaryRef CreateShadowDrawTarget(const IntSize &aSize, SurfaceFormat aFormat, - float aSigma) const; + float aSigma) const MOZ_OVERRIDE; virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, - ExtendMode aExtendMode = ExtendMode::CLAMP) const; + ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE; - virtual TemporaryRef CreateFilter(FilterType aType); + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE; - virtual void *GetNativeSurface(NativeSurfaceType aType); + virtual void *GetNativeSurface(NativeSurfaceType aType) MOZ_OVERRIDE; bool Init(cairo_surface_t* aSurface, const IntSize& aSize, SurfaceFormat* aFormat = nullptr); bool Init(const IntSize& aSize, SurfaceFormat aFormat); bool Init(unsigned char* aData, const IntSize &aSize, int32_t aStride, SurfaceFormat aFormat); - virtual void SetTransform(const Matrix& aTransform); + virtual void SetTransform(const Matrix& aTransform) MOZ_OVERRIDE; // Call to set up aContext for drawing (with the current transform, etc). // Pass the path you're going to be using if you have one. diff --git a/gfx/2d/DrawTargetDual.h b/gfx/2d/DrawTargetDual.h index e40e9c9a0b9..0f35ba47ec1 100644 --- a/gfx/2d/DrawTargetDual.h +++ b/gfx/2d/DrawTargetDual.h @@ -18,9 +18,9 @@ namespace mozilla { namespace gfx { #define FORWARD_FUNCTION(funcName) \ - virtual void funcName() { mA->funcName(); mB->funcName(); } + virtual void funcName() MOZ_OVERRIDE { mA->funcName(); mB->funcName(); } #define FORWARD_FUNCTION1(funcName, var1Type, var1Name) \ - virtual void funcName(var1Type var1Name) { mA->funcName(var1Name); mB->funcName(var1Name); } + virtual void funcName(var1Type var1Name) MOZ_OVERRIDE { mA->funcName(var1Name); mB->funcName(var1Name); } /* This is a special type of DrawTarget. It duplicates all drawing calls * accross two drawtargets. An exception to this is when a snapshot of another @@ -35,7 +35,7 @@ namespace gfx { class DrawTargetDual : public DrawTarget { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetDual) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetDual, MOZ_OVERRIDE) DrawTargetDual(DrawTarget *aA, DrawTarget *aB) : mA(aA) , mB(aB) @@ -44,9 +44,9 @@ public: } virtual DrawTargetType GetType() const MOZ_OVERRIDE { return mA->GetType(); } - virtual BackendType GetBackendType() const { return mA->GetBackendType(); } - virtual TemporaryRef Snapshot() { return new SourceSurfaceDual(mA, mB); } - virtual IntSize GetSize() { return mA->GetSize(); } + virtual BackendType GetBackendType() const MOZ_OVERRIDE { return mA->GetBackendType(); } + virtual TemporaryRef Snapshot() MOZ_OVERRIDE { return new SourceSurfaceDual(mA, mB); } + virtual IntSize GetSize() MOZ_OVERRIDE { return mA->GetSize(); } FORWARD_FUNCTION(Flush) FORWARD_FUNCTION1(PushClip, const Path *, aPath) @@ -54,19 +54,19 @@ public: FORWARD_FUNCTION(PopClip) FORWARD_FUNCTION1(ClearRect, const Rect &, aRect) - virtual void SetTransform(const Matrix &aTransform) { + virtual void SetTransform(const Matrix &aTransform) MOZ_OVERRIDE { mTransform = aTransform; mA->SetTransform(aTransform); mB->SetTransform(aTransform); } virtual void DrawSurface(SourceSurface *aSurface, const Rect &aDest, const Rect & aSource, - const DrawSurfaceOptions &aSurfOptions, const DrawOptions &aOptions); + const DrawSurfaceOptions &aSurfOptions, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()) + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE { mA->DrawFilter(aNode, aSourceRect, aDestPoint, aOptions); mB->DrawFilter(aNode, aSourceRect, aDestPoint, aOptions); @@ -75,58 +75,58 @@ public: virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawSurfaceWithShadow(SourceSurface *aSurface, const Point &aDest, const Color &aColor, const Point &aOffset, - Float aSigma, CompositionOp aOp); + Float aSigma, CompositionOp aOp) MOZ_OVERRIDE; virtual void CopySurface(SourceSurface *aSurface, const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; - virtual void FillRect(const Rect &aRect, const Pattern &aPattern, const DrawOptions &aOptions); + virtual void FillRect(const Rect &aRect, const Pattern &aPattern, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void StrokeRect(const Rect &aRect, const Pattern &aPattern, - const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions); + const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void StrokeLine(const Point &aStart, const Point &aEnd, const Pattern &aPattern, - const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions); + const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void Stroke(const Path *aPath, const Pattern &aPattern, - const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions); + const StrokeOptions &aStrokeOptions, const DrawOptions &aOptions) MOZ_OVERRIDE; - virtual void Fill(const Path *aPath, const Pattern &aPattern, const DrawOptions &aOptions); + virtual void Fill(const Path *aPath, const Pattern &aPattern, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void FillGlyphs(ScaledFont *aScaledFont, const GlyphBuffer &aBuffer, const Pattern &aPattern, const DrawOptions &aOptions, - const GlyphRenderingOptions *aRenderingOptions); + const GlyphRenderingOptions *aRenderingOptions) MOZ_OVERRIDE; - virtual void Mask(const Pattern &aSource, const Pattern &aMask, const DrawOptions &aOptions); + virtual void Mask(const Pattern &aSource, const Pattern &aMask, const DrawOptions &aOptions) MOZ_OVERRIDE; virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const + SurfaceFormat aFormat) const MOZ_OVERRIDE { return mA->CreateSourceSurfaceFromData(aData, aSize, aStride, aFormat); } - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE { return mA->OptimizeSourceSurface(aSurface); } virtual TemporaryRef - CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const + CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const MOZ_OVERRIDE { return mA->CreateSourceSurfaceFromNativeSurface(aSurface); } virtual TemporaryRef - CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const; + CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const MOZ_OVERRIDE; - virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const + virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const MOZ_OVERRIDE { return mA->CreatePathBuilder(aFillRule); } @@ -134,22 +134,22 @@ public: virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, - ExtendMode aExtendMode = ExtendMode::CLAMP) const + ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE { return mA->CreateGradientStops(aStops, aNumStops, aExtendMode); } - virtual TemporaryRef CreateFilter(FilterType aType) + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE { return mA->CreateFilter(aType); } - virtual void *GetNativeSurface(NativeSurfaceType aType) + virtual void *GetNativeSurface(NativeSurfaceType aType) MOZ_OVERRIDE { return nullptr; } - virtual bool IsDualDrawTarget() const + virtual bool IsDualDrawTarget() const MOZ_OVERRIDE { return true; } diff --git a/gfx/2d/DrawTargetRecording.cpp b/gfx/2d/DrawTargetRecording.cpp index e32250c34ed..dd509c7df37 100644 --- a/gfx/2d/DrawTargetRecording.cpp +++ b/gfx/2d/DrawTargetRecording.cpp @@ -80,7 +80,7 @@ GetGradientStops(GradientStops *aStops) class FilterNodeRecording : public FilterNode { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeRecording) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeRecording, MOZ_OVERRIDE) using FilterNode::SetAttribute; FilterNodeRecording(FilterNode *aFinalFilterNode, DrawEventRecorderPrivate *aRecorder) @@ -93,12 +93,12 @@ public: mRecorder->RecordEvent(RecordedFilterNodeDestruction(this)); } - virtual void SetInput(uint32_t aIndex, SourceSurface *aSurface) + virtual void SetInput(uint32_t aIndex, SourceSurface *aSurface) MOZ_OVERRIDE { mRecorder->RecordEvent(RecordedFilterNodeSetInput(this, aIndex, aSurface)); mFinalFilterNode->SetInput(aIndex, GetSourceSurface(aSurface)); } - virtual void SetInput(uint32_t aIndex, FilterNode *aFilter) + virtual void SetInput(uint32_t aIndex, FilterNode *aFilter) MOZ_OVERRIDE { FilterNode *finalNode = aFilter; if (aFilter->GetBackendType() != FILTER_BACKEND_RECORDING) { @@ -113,7 +113,7 @@ public: #define FORWARD_SET_ATTRIBUTE(type, argtype) \ - virtual void SetAttribute(uint32_t aIndex, type aValue) { \ + virtual void SetAttribute(uint32_t aIndex, type aValue) MOZ_OVERRIDE { \ mRecorder->RecordEvent(RecordedFilterNodeSetAttribute(this, aIndex, aValue, RecordedFilterNodeSetAttribute::ARGTYPE_##argtype)); \ mFinalFilterNode->SetAttribute(aIndex, aValue); \ } @@ -133,7 +133,7 @@ public: #undef FORWARD_SET_ATTRIBUTE - virtual void SetAttribute(uint32_t aIndex, const Float* aFloat, uint32_t aSize) { + virtual void SetAttribute(uint32_t aIndex, const Float* aFloat, uint32_t aSize) MOZ_OVERRIDE { mRecorder->RecordEvent(RecordedFilterNodeSetAttribute(this, aIndex, aFloat, aSize)); mFinalFilterNode->SetAttribute(aIndex, aFloat, aSize); } diff --git a/gfx/2d/DrawTargetRecording.h b/gfx/2d/DrawTargetRecording.h index 9bb8836d159..adf7dd563da 100644 --- a/gfx/2d/DrawTargetRecording.h +++ b/gfx/2d/DrawTargetRecording.h @@ -15,22 +15,22 @@ namespace gfx { class DrawTargetRecording : public DrawTarget { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetRecording) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetRecording, MOZ_OVERRIDE) DrawTargetRecording(DrawEventRecorder *aRecorder, DrawTarget *aDT, bool aHasData = false); ~DrawTargetRecording(); virtual DrawTargetType GetType() const MOZ_OVERRIDE { return mFinalDT->GetType(); } - virtual BackendType GetBackendType() const { return mFinalDT->GetBackendType(); } + virtual BackendType GetBackendType() const MOZ_OVERRIDE { return mFinalDT->GetBackendType(); } - virtual TemporaryRef Snapshot(); + virtual TemporaryRef Snapshot() MOZ_OVERRIDE; - virtual IntSize GetSize() { return mFinalDT->GetSize(); } + virtual IntSize GetSize() MOZ_OVERRIDE { return mFinalDT->GetSize(); } /* Ensure that the DrawTarget backend has flushed all drawing operations to * this draw target. This must be called before using the backing surface of * this draw target outside of GFX 2D code. */ - virtual void Flush() { mFinalDT->Flush(); } + virtual void Flush() MOZ_OVERRIDE { mFinalDT->Flush(); } /* * Draw a surface to the draw target. Possibly doing partial drawing or @@ -47,12 +47,12 @@ public: const Rect &aDest, const Rect &aSource, const DrawSurfaceOptions &aSurfOptions = DrawSurfaceOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Blend a surface to the draw target with a shadow. The shadow is drawn as a @@ -73,7 +73,7 @@ public: const Color &aColor, const Point &aOffset, Float aSigma, - CompositionOp aOperator); + CompositionOp aOperator) MOZ_OVERRIDE; /* * Clear a rectangle on the draw target to transparent black. This will @@ -81,7 +81,7 @@ public: * * aRect Rectangle to clear */ - virtual void ClearRect(const Rect &aRect); + virtual void ClearRect(const Rect &aRect) MOZ_OVERRIDE; /* * This is essentially a 'memcpy' between two surfaces. It moves a pixel @@ -94,7 +94,7 @@ public: */ virtual void CopySurface(SourceSurface *aSurface, const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; /* * Fill a rectangle on the DrawTarget with a certain source pattern. @@ -105,7 +105,7 @@ public: */ virtual void FillRect(const Rect &aRect, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Stroke a rectangle on the DrawTarget with a certain source pattern. @@ -117,7 +117,7 @@ public: virtual void StrokeRect(const Rect &aRect, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Stroke a line on the DrawTarget with a certain source pattern. @@ -131,7 +131,7 @@ public: const Point &aEnd, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Stroke a path on the draw target with a certain source pattern. @@ -144,7 +144,7 @@ public: virtual void Stroke(const Path *aPath, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Fill a path on the draw target with a certain source pattern. @@ -155,7 +155,7 @@ public: */ virtual void Fill(const Path *aPath, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Fill a series of clyphs on the draw target with a certain source pattern. @@ -164,7 +164,7 @@ public: const GlyphBuffer &aBuffer, const Pattern &aPattern, const DrawOptions &aOptions = DrawOptions(), - const GlyphRenderingOptions *aRenderingOptions = nullptr); + const GlyphRenderingOptions *aRenderingOptions = nullptr) MOZ_OVERRIDE; /* * This takes a source pattern and a mask, and composites the source pattern @@ -177,19 +177,19 @@ public: */ virtual void Mask(const Pattern &aSource, const Pattern &aMask, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; /* * Push a clip to the DrawTarget. * * aPath The path to clip to */ - virtual void PushClip(const Path *aPath); + virtual void PushClip(const Path *aPath) MOZ_OVERRIDE; /* * Push an axis-aligned rectangular clip to the DrawTarget. This rectangle @@ -197,12 +197,12 @@ public: * * aRect The rect to clip to */ - virtual void PushClipRect(const Rect &aRect); + virtual void PushClipRect(const Rect &aRect) MOZ_OVERRIDE; /* Pop a clip from the DrawTarget. A pop without a corresponding push will * be ignored. */ - virtual void PopClip(); + virtual void PopClip() MOZ_OVERRIDE; /* * Create a SourceSurface optimized for use with this DrawTarget from @@ -213,14 +213,14 @@ public: virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const; + SurfaceFormat aFormat) const MOZ_OVERRIDE; /* * Create a SourceSurface optimized for use with this DrawTarget from * an arbitrary other SourceSurface. This may return aSourceSurface or some * other existing surface. */ - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const; + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE; /* * Create a SourceSurface for a type of NativeSurface. This may fail if the @@ -228,13 +228,13 @@ public: * in. */ virtual TemporaryRef - CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const; + CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const MOZ_OVERRIDE; /* * Create a DrawTarget whose snapshot is optimized for use with this DrawTarget. */ virtual TemporaryRef - CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const; + CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const MOZ_OVERRIDE; /* * Create a path builder with the specified fillmode. @@ -243,7 +243,7 @@ public: * ID2D1SimplifiedGeometrySink requires the fill mode * to be set before calling BeginFigure(). */ - virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const; + virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const MOZ_OVERRIDE; /* * Create a GradientStops object that holds information about a set of @@ -258,20 +258,20 @@ public: virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, - ExtendMode aExtendMode = ExtendMode::CLAMP) const; + ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE; - virtual TemporaryRef CreateFilter(FilterType aType); + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE; /* * Set a transform on the surface, this transform is applied at drawing time * to both the mask and source of the operation. */ - virtual void SetTransform(const Matrix &aTransform); + virtual void SetTransform(const Matrix &aTransform) MOZ_OVERRIDE; /* Tries to get a native surface for a DrawTarget, this may fail if the * draw target cannot convert to this surface type. */ - virtual void *GetNativeSurface(NativeSurfaceType aType) { return mFinalDT->GetNativeSurface(aType); } + virtual void *GetNativeSurface(NativeSurfaceType aType) MOZ_OVERRIDE { return mFinalDT->GetNativeSurface(aType); } private: Path *GetPathForPathRecording(const Path *aPath) const; diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h index 32be8173d72..3bfe70937a1 100644 --- a/gfx/2d/DrawTargetSkia.h +++ b/gfx/2d/DrawTargetSkia.h @@ -28,82 +28,82 @@ class SourceSurfaceSkia; class DrawTargetSkia : public DrawTarget { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetSkia) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DrawTargetSkia, MOZ_OVERRIDE) DrawTargetSkia(); virtual ~DrawTargetSkia(); virtual DrawTargetType GetType() const MOZ_OVERRIDE; - virtual BackendType GetBackendType() const { return BackendType::SKIA; } - virtual TemporaryRef Snapshot(); - virtual IntSize GetSize() { return mSize; } - virtual void Flush(); + virtual BackendType GetBackendType() const MOZ_OVERRIDE { return BackendType::SKIA; } + virtual TemporaryRef Snapshot() MOZ_OVERRIDE; + virtual IntSize GetSize() MOZ_OVERRIDE { return mSize; } + virtual void Flush() MOZ_OVERRIDE; virtual void DrawSurface(SourceSurface *aSurface, const Rect &aDest, const Rect &aSource, const DrawSurfaceOptions &aSurfOptions = DrawSurfaceOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawSurfaceWithShadow(SourceSurface *aSurface, const Point &aDest, const Color &aColor, const Point &aOffset, Float aSigma, - CompositionOp aOperator); - virtual void ClearRect(const Rect &aRect); + CompositionOp aOperator) MOZ_OVERRIDE; + virtual void ClearRect(const Rect &aRect) MOZ_OVERRIDE; virtual void CopySurface(SourceSurface *aSurface, const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; virtual void FillRect(const Rect &aRect, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeRect(const Rect &aRect, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeLine(const Point &aStart, const Point &aEnd, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Stroke(const Path *aPath, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Fill(const Path *aPath, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pattern &aPattern, const DrawOptions &aOptions = DrawOptions(), - const GlyphRenderingOptions *aRenderingOptions = nullptr); + const GlyphRenderingOptions *aRenderingOptions = nullptr) MOZ_OVERRIDE; virtual void Mask(const Pattern &aSource, const Pattern &aMask, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); - virtual void PushClip(const Path *aPath); - virtual void PushClipRect(const Rect& aRect); - virtual void PopClip(); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; + virtual void PushClip(const Path *aPath) MOZ_OVERRIDE; + virtual void PushClipRect(const Rect& aRect) MOZ_OVERRIDE; + virtual void PopClip() MOZ_OVERRIDE; virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const; - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const; + SurfaceFormat aFormat) const MOZ_OVERRIDE; + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE; virtual TemporaryRef - CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const; + CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const MOZ_OVERRIDE; virtual TemporaryRef - CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const; - virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const; - virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, ExtendMode aExtendMode = ExtendMode::CLAMP) const; - virtual TemporaryRef CreateFilter(FilterType aType); - virtual void SetTransform(const Matrix &aTransform); - virtual void *GetNativeSurface(NativeSurfaceType aType); + CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const MOZ_OVERRIDE; + virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const MOZ_OVERRIDE; + virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE; + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE; + virtual void SetTransform(const Matrix &aTransform) MOZ_OVERRIDE; + virtual void *GetNativeSurface(NativeSurfaceType aType) MOZ_OVERRIDE; bool Init(const IntSize &aSize, SurfaceFormat aFormat); void Init(unsigned char* aData, const IntSize &aSize, int32_t aStride, SurfaceFormat aFormat); diff --git a/gfx/2d/DrawTargetTiled.h b/gfx/2d/DrawTargetTiled.h index 52042886138..b0cd4d50453 100644 --- a/gfx/2d/DrawTargetTiled.h +++ b/gfx/2d/DrawTargetTiled.h @@ -35,101 +35,101 @@ public: bool Init(const TileSet& mTiles); - virtual bool IsTiledDrawTarget() const { return true; } + virtual bool IsTiledDrawTarget() const MOZ_OVERRIDE { return true; } virtual DrawTargetType GetType() const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->GetType(); } - virtual BackendType GetBackendType() const { return mTiles[0].mDrawTarget->GetBackendType(); } - virtual TemporaryRef Snapshot(); - virtual IntSize GetSize() { + virtual BackendType GetBackendType() const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->GetBackendType(); } + virtual TemporaryRef Snapshot() MOZ_OVERRIDE; + virtual IntSize GetSize() MOZ_OVERRIDE { MOZ_ASSERT(mRect.width > 0 && mRect.height > 0); return IntSize(mRect.XMost(), mRect.YMost()); } - virtual void Flush(); + virtual void Flush() MOZ_OVERRIDE; virtual void DrawSurface(SourceSurface *aSurface, const Rect &aDest, const Rect &aSource, const DrawSurfaceOptions &aSurfOptions, - const DrawOptions &aOptions); + const DrawOptions &aOptions) MOZ_OVERRIDE; virtual void DrawFilter(FilterNode *aNode, const Rect &aSourceRect, const Point &aDestPoint, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void DrawSurfaceWithShadow(SourceSurface *aSurface, const Point &aDest, const Color &aColor, const Point &aOffset, Float aSigma, - CompositionOp aOperator) { /* Not implemented */ MOZ_CRASH(); } + CompositionOp aOperator) MOZ_OVERRIDE { /* Not implemented */ MOZ_CRASH(); } - virtual void ClearRect(const Rect &aRect); + virtual void ClearRect(const Rect &aRect) MOZ_OVERRIDE; virtual void MaskSurface(const Pattern &aSource, SourceSurface *aMask, Point aOffset, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void CopySurface(SourceSurface *aSurface, const IntRect &aSourceRect, - const IntPoint &aDestination); + const IntPoint &aDestination) MOZ_OVERRIDE; virtual void FillRect(const Rect &aRect, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeRect(const Rect &aRect, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void StrokeLine(const Point &aStart, const Point &aEnd, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Stroke(const Path *aPath, const Pattern &aPattern, const StrokeOptions &aStrokeOptions = StrokeOptions(), - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void Fill(const Path *aPath, const Pattern &aPattern, - const DrawOptions &aOptions = DrawOptions()); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; virtual void FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pattern &aPattern, const DrawOptions &aOptions = DrawOptions(), - const GlyphRenderingOptions *aRenderingOptions = nullptr); + const GlyphRenderingOptions *aRenderingOptions = nullptr) MOZ_OVERRIDE; virtual void Mask(const Pattern &aSource, const Pattern &aMask, - const DrawOptions &aOptions = DrawOptions()); - virtual void PushClip(const Path *aPath); - virtual void PushClipRect(const Rect &aRect); - virtual void PopClip(); + const DrawOptions &aOptions = DrawOptions()) MOZ_OVERRIDE; + virtual void PushClip(const Path *aPath) MOZ_OVERRIDE; + virtual void PushClipRect(const Rect &aRect) MOZ_OVERRIDE; + virtual void PopClip() MOZ_OVERRIDE; - virtual void SetTransform(const Matrix &aTransform); + virtual void SetTransform(const Matrix &aTransform) MOZ_OVERRIDE; virtual TemporaryRef CreateSourceSurfaceFromData(unsigned char *aData, const IntSize &aSize, int32_t aStride, - SurfaceFormat aFormat) const + SurfaceFormat aFormat) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreateSourceSurfaceFromData(aData, aSize, aStride, aFormat); } - virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const + virtual TemporaryRef OptimizeSourceSurface(SourceSurface *aSurface) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->OptimizeSourceSurface(aSurface); } virtual TemporaryRef - CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const + CreateSourceSurfaceFromNativeSurface(const NativeSurface &aSurface) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreateSourceSurfaceFromNativeSurface(aSurface); } virtual TemporaryRef - CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const + CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFormat) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreateSimilarDrawTarget(aSize, aFormat); } - virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const + virtual TemporaryRef CreatePathBuilder(FillRule aFillRule = FillRule::FILL_WINDING) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreatePathBuilder(aFillRule); } @@ -137,11 +137,11 @@ public: virtual TemporaryRef CreateGradientStops(GradientStop *aStops, uint32_t aNumStops, - ExtendMode aExtendMode = ExtendMode::CLAMP) const + ExtendMode aExtendMode = ExtendMode::CLAMP) const MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreateGradientStops(aStops, aNumStops, aExtendMode); } - virtual TemporaryRef CreateFilter(FilterType aType) + virtual TemporaryRef CreateFilter(FilterType aType) MOZ_OVERRIDE { return mTiles[0].mDrawTarget->CreateFilter(aType); } diff --git a/gfx/2d/FilterNodeSoftware.h b/gfx/2d/FilterNodeSoftware.h index 73b54178d76..fcdb742ff96 100644 --- a/gfx/2d/FilterNodeSoftware.h +++ b/gfx/2d/FilterNodeSoftware.h @@ -38,7 +38,7 @@ class FilterNodeSoftware : public FilterNode, public FilterInvalidationListener { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeSoftware, MOZ_OVERRIDE) virtual ~FilterNodeSoftware(); // Factory method, intended to be called from DrawTarget*::CreateFilter. @@ -58,7 +58,7 @@ public: virtual void RemoveInvalidationListener(FilterInvalidationListener* aListener); // FilterInvalidationListener implementation - virtual void FilterInvalidated(FilterNodeSoftware* aFilter); + virtual void FilterInvalidated(FilterNodeSoftware* aFilter) MOZ_OVERRIDE; protected: @@ -218,7 +218,7 @@ protected: class FilterNodeTransformSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTransformSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTransformSoftware, MOZ_OVERRIDE) FilterNodeTransformSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "Transform"; } using FilterNodeSoftware::SetAttribute; @@ -240,7 +240,7 @@ private: class FilterNodeBlendSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeBlendSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeBlendSoftware, MOZ_OVERRIDE) FilterNodeBlendSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "Blend"; } using FilterNodeSoftware::SetAttribute; @@ -259,7 +259,7 @@ private: class FilterNodeMorphologySoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeMorphologySoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeMorphologySoftware, MOZ_OVERRIDE) FilterNodeMorphologySoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "Morphology"; } using FilterNodeSoftware::SetAttribute; @@ -280,7 +280,7 @@ private: class FilterNodeColorMatrixSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeColorMatrixSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeColorMatrixSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "ColorMatrix"; } using FilterNodeSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const Matrix5x4 &aMatrix) MOZ_OVERRIDE; @@ -300,7 +300,7 @@ private: class FilterNodeFloodSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeFloodSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeFloodSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "Flood"; } using FilterNodeSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const Color &aColor) MOZ_OVERRIDE; @@ -317,7 +317,7 @@ private: class FilterNodeTileSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTileSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTileSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "Tile"; } using FilterNodeSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const IntRect &aSourceRect) MOZ_OVERRIDE; @@ -338,7 +338,7 @@ private: class FilterNodeComponentTransferSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeComponentTransferSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeComponentTransferSoftware, MOZ_OVERRIDE) FilterNodeComponentTransferSoftware(); using FilterNodeSoftware::SetAttribute; @@ -362,7 +362,7 @@ protected: class FilterNodeTableTransferSoftware : public FilterNodeComponentTransferSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTableTransferSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTableTransferSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "TableTransfer"; } using FilterNodeComponentTransferSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const Float* aFloat, uint32_t aSize) MOZ_OVERRIDE; @@ -382,7 +382,7 @@ private: class FilterNodeDiscreteTransferSoftware : public FilterNodeComponentTransferSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDiscreteTransferSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDiscreteTransferSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "DiscreteTransfer"; } using FilterNodeComponentTransferSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const Float* aFloat, uint32_t aSize) MOZ_OVERRIDE; @@ -402,7 +402,7 @@ private: class FilterNodeLinearTransferSoftware : public FilterNodeComponentTransferSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeLinearTransformSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeLinearTransformSoftware, MOZ_OVERRIDE) FilterNodeLinearTransferSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "LinearTransfer"; } using FilterNodeComponentTransferSoftware::SetAttribute; @@ -427,7 +427,7 @@ private: class FilterNodeGammaTransferSoftware : public FilterNodeComponentTransferSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeGammaTransferSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeGammaTransferSoftware, MOZ_OVERRIDE) FilterNodeGammaTransferSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "GammaTransfer"; } using FilterNodeComponentTransferSoftware::SetAttribute; @@ -456,7 +456,7 @@ private: class FilterNodeConvolveMatrixSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeConvolveMatrixSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeConvolveMatrixSoftware, MOZ_OVERRIDE) FilterNodeConvolveMatrixSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "ConvolveMatrix"; } using FilterNodeSoftware::SetAttribute; @@ -498,7 +498,7 @@ private: class FilterNodeDisplacementMapSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDisplacementMapSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDisplacementMapSoftware, MOZ_OVERRIDE) FilterNodeDisplacementMapSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "DisplacementMap"; } using FilterNodeSoftware::SetAttribute; @@ -522,7 +522,7 @@ private: class FilterNodeTurbulenceSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTurbulenceSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeTurbulenceSoftware, MOZ_OVERRIDE) FilterNodeTurbulenceSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "Turbulence"; } using FilterNodeSoftware::SetAttribute; @@ -548,7 +548,7 @@ private: class FilterNodeArithmeticCombineSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeArithmeticCombineSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeArithmeticCombineSoftware, MOZ_OVERRIDE) FilterNodeArithmeticCombineSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "ArithmeticCombine"; } using FilterNodeSoftware::SetAttribute; @@ -570,7 +570,7 @@ private: class FilterNodeCompositeSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeCompositeSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeCompositeSoftware, MOZ_OVERRIDE) FilterNodeCompositeSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "Composite"; } using FilterNodeSoftware::SetAttribute; @@ -591,7 +591,7 @@ private: class FilterNodeBlurXYSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeBlurXYSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeBlurXYSoftware, MOZ_OVERRIDE) protected: virtual TemporaryRef Render(const IntRect& aRect) MOZ_OVERRIDE; virtual IntRect GetOutputRectInRect(const IntRect& aRect) MOZ_OVERRIDE; @@ -606,7 +606,7 @@ protected: class FilterNodeGaussianBlurSoftware : public FilterNodeBlurXYSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeGaussianBlurSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeGaussianBlurSoftware, MOZ_OVERRIDE) FilterNodeGaussianBlurSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "GaussianBlur"; } using FilterNodeSoftware::SetAttribute; @@ -622,7 +622,7 @@ private: class FilterNodeDirectionalBlurSoftware : public FilterNodeBlurXYSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDirectionalBlurSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeDirectionalBlurSoftware, MOZ_OVERRIDE) FilterNodeDirectionalBlurSoftware(); virtual const char* GetName() MOZ_OVERRIDE { return "DirectionalBlur"; } using FilterNodeSoftware::SetAttribute; @@ -640,7 +640,7 @@ private: class FilterNodeCropSoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeCropSoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeCropSoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "Crop"; } using FilterNodeSoftware::SetAttribute; virtual void SetAttribute(uint32_t aIndex, const Rect &aSourceRect) MOZ_OVERRIDE; @@ -658,7 +658,7 @@ private: class FilterNodePremultiplySoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodePremultiplySoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodePremultiplySoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "Premultiply"; } protected: virtual TemporaryRef Render(const IntRect& aRect) MOZ_OVERRIDE; @@ -670,7 +670,7 @@ protected: class FilterNodeUnpremultiplySoftware : public FilterNodeSoftware { public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeUnpremultiplySoftware) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(FilterNodeUnpremultiplySoftware, MOZ_OVERRIDE) virtual const char* GetName() MOZ_OVERRIDE { return "Unpremultiply"; } protected: virtual TemporaryRef Render(const IntRect& aRect) MOZ_OVERRIDE; diff --git a/gfx/gl/GLContextCGL.h b/gfx/gl/GLContextCGL.h index ef78e118700..9b3c52ddd8e 100644 --- a/gfx/gl/GLContextCGL.h +++ b/gfx/gl/GLContextCGL.h @@ -27,7 +27,7 @@ class GLContextCGL : public GLContext NSOpenGLContext *mContext; public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextCGL) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextCGL, MOZ_OVERRIDE) GLContextCGL(const SurfaceCaps& caps, GLContext *shareContext, NSOpenGLContext *context, diff --git a/gfx/gl/GLContextEGL.h b/gfx/gl/GLContextEGL.h index 21dcca5f179..b8d3122d9d5 100644 --- a/gfx/gl/GLContextEGL.h +++ b/gfx/gl/GLContextEGL.h @@ -29,7 +29,7 @@ class GLContextEGL : public GLContext EGLSurface surface); public: - MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextEGL) + MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextEGL, MOZ_OVERRIDE) GLContextEGL(const SurfaceCaps& caps, GLContext* shareContext, bool isOffscreen, diff --git a/gfx/gl/GfxTexturesReporter.h b/gfx/gl/GfxTexturesReporter.h index 0386f254b37..4ddadef24bb 100644 --- a/gfx/gl/GfxTexturesReporter.h +++ b/gfx/gl/GfxTexturesReporter.h @@ -49,7 +49,7 @@ public: } NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport, - nsISupports* aData, bool aAnonymize) + nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE { MOZ_COLLECT_REPORT("gfx-tiles-waste", KIND_OTHER, UNITS_BYTES, sTileWasteAmount, diff --git a/gfx/skia/trunk/include/effects/SkLayerRasterizer.h b/gfx/skia/trunk/include/effects/SkLayerRasterizer.h index 44cbfa0b1d6..a98f1df613c 100644 --- a/gfx/skia/trunk/include/effects/SkLayerRasterizer.h +++ b/gfx/skia/trunk/include/effects/SkLayerRasterizer.h @@ -75,7 +75,7 @@ protected: // override from SkRasterizer virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix, const SkIRect* clipBounds, - SkMask* mask, SkMask::CreateMode mode) const; + SkMask* mask, SkMask::CreateMode mode) const SK_OVERRIDE; private: const SkDeque* const fLayers; diff --git a/gfx/skia/trunk/include/gpu/SkGpuDevice.h b/gfx/skia/trunk/include/gpu/SkGpuDevice.h index 9a5a92e2df5..6e972871f8b 100644 --- a/gfx/skia/trunk/include/gpu/SkGpuDevice.h +++ b/gfx/skia/trunk/include/gpu/SkGpuDevice.h @@ -97,7 +97,7 @@ public: const SkPaint& paint, SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE; virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, - int x, int y, const SkPaint& paint); + int x, int y, const SkPaint& paint) SK_OVERRIDE; virtual void drawText(const SkDraw&, const void* text, size_t len, SkScalar x, SkScalar y, const SkPaint&) SK_OVERRIDE; virtual void drawPosText(const SkDraw&, const void* text, size_t len, diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp index a2c879173c9..2d696658ae0 100644 --- a/gfx/thebes/gfxASurface.cpp +++ b/gfx/thebes/gfxASurface.cpp @@ -588,7 +588,7 @@ public: NS_DECL_ISUPPORTS NS_IMETHOD CollectReports(nsIMemoryReporterCallback *aCb, - nsISupports *aClosure, bool aAnonymize) + nsISupports *aClosure, bool aAnonymize) MOZ_OVERRIDE { const size_t len = ArrayLength(sSurfaceMemoryReporterAttrs); for (size_t i = 0; i < len; i++) { diff --git a/gfx/thebes/gfxFontInfoLoader.cpp b/gfx/thebes/gfxFontInfoLoader.cpp index 08ee3455b36..185a6d23e5f 100644 --- a/gfx/thebes/gfxFontInfoLoader.cpp +++ b/gfx/thebes/gfxFontInfoLoader.cpp @@ -35,7 +35,7 @@ class FontInfoLoadCompleteEvent : public nsRunnable { mFontInfo(aFontInfo) {} - NS_IMETHOD Run(); + NS_IMETHOD Run() MOZ_OVERRIDE; nsRefPtr mFontInfo; }; @@ -51,7 +51,7 @@ class AsyncFontInfoLoader : public nsRunnable { mCompleteEvent = new FontInfoLoadCompleteEvent(aFontInfo); } - NS_IMETHOD Run(); + NS_IMETHOD Run() MOZ_OVERRIDE; nsRefPtr mFontInfo; nsRefPtr mCompleteEvent; diff --git a/gfx/thebes/gfxImageSurface.h b/gfx/thebes/gfxImageSurface.h index 373626f60fb..6d0bdcd4d7e 100644 --- a/gfx/thebes/gfxImageSurface.h +++ b/gfx/thebes/gfxImageSurface.h @@ -76,7 +76,7 @@ public: // ImageSurface methods gfxImageFormat Format() const { return mFormat; } - virtual const gfxIntSize GetSize() const { return mSize; } + virtual const gfxIntSize GetSize() const MOZ_OVERRIDE { return mSize; } int32_t Width() const { return mSize.width; } int32_t Height() const { return mSize.height; } @@ -121,7 +121,7 @@ public: */ already_AddRefed GetSubimage(const gfxRect& aRect); - virtual already_AddRefed GetAsImageSurface(); + virtual already_AddRefed GetAsImageSurface() MOZ_OVERRIDE; /** See gfxASurface.h. */ static long ComputeStride(const gfxIntSize&, gfxImageFormat); diff --git a/gfx/thebes/gfxMacFont.h b/gfx/thebes/gfxMacFont.h index 4ca692c1960..3c39d7faf3c 100644 --- a/gfx/thebes/gfxMacFont.h +++ b/gfx/thebes/gfxMacFont.h @@ -55,9 +55,9 @@ public: GetGlyphRenderingOptions(const TextRunDrawParams* aRunParams = nullptr) MOZ_OVERRIDE; virtual void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf, - FontCacheSizes* aSizes) const; + FontCacheSizes* aSizes) const MOZ_OVERRIDE; virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf, - FontCacheSizes* aSizes) const; + FontCacheSizes* aSizes) const MOZ_OVERRIDE; virtual FontType GetType() const MOZ_OVERRIDE { return FONT_TYPE_MAC; } diff --git a/gfx/thebes/gfxMacPlatformFontList.h b/gfx/thebes/gfxMacPlatformFontList.h index 3e51140a37b..3d7f0a9293f 100644 --- a/gfx/thebes/gfxMacPlatformFontList.h +++ b/gfx/thebes/gfxMacPlatformFontList.h @@ -46,18 +46,18 @@ public: virtual hb_blob_t *GetFontTable(uint32_t aTag) MOZ_OVERRIDE; virtual void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf, - FontListSizes* aSizes) const; + FontListSizes* aSizes) const MOZ_OVERRIDE; - nsresult ReadCMAP(FontInfoData *aFontInfoData = nullptr); + nsresult ReadCMAP(FontInfoData *aFontInfoData = nullptr) MOZ_OVERRIDE; bool RequiresAATLayout() const { return mRequiresAAT; } bool IsCFF(); protected: - virtual gfxFont* CreateFontInstance(const gfxFontStyle *aFontStyle, bool aNeedsBold); + virtual gfxFont* CreateFontInstance(const gfxFontStyle *aFontStyle, bool aNeedsBold) MOZ_OVERRIDE; - virtual bool HasFontTable(uint32_t aTableTag); + virtual bool HasFontTable(uint32_t aTableTag) MOZ_OVERRIDE; static void DestroyBlobFunc(void* aUserData); diff --git a/gfx/thebes/gfxPlatformMac.h b/gfx/thebes/gfxPlatformMac.h index b75b1907dd5..8e887613000 100644 --- a/gfx/thebes/gfxPlatformMac.h +++ b/gfx/thebes/gfxPlatformMac.h @@ -30,39 +30,39 @@ public: gfxContentType contentType) MOZ_OVERRIDE; mozilla::TemporaryRef - GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont); + GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont) MOZ_OVERRIDE; - nsresult GetStandardFamilyName(const nsAString& aFontName, nsAString& aFamilyName); + nsresult GetStandardFamilyName(const nsAString& aFontName, nsAString& aFamilyName) MOZ_OVERRIDE; gfxFontGroup* CreateFontGroup(const mozilla::FontFamilyList& aFontFamilyList, const gfxFontStyle *aStyle, - gfxUserFontSet *aUserFontSet); + gfxUserFontSet *aUserFontSet) MOZ_OVERRIDE; virtual gfxFontEntry* LookupLocalFont(const nsAString& aFontName, uint16_t aWeight, int16_t aStretch, - bool aItalic); + bool aItalic) MOZ_OVERRIDE; - virtual gfxPlatformFontList* CreatePlatformFontList(); + virtual gfxPlatformFontList* CreatePlatformFontList() MOZ_OVERRIDE; virtual gfxFontEntry* MakePlatformFont(const nsAString& aFontName, uint16_t aWeight, int16_t aStretch, bool aItalic, const uint8_t* aFontData, - uint32_t aLength); + uint32_t aLength) MOZ_OVERRIDE; - bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags); + bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags) MOZ_OVERRIDE; nsresult GetFontList(nsIAtom *aLangGroup, const nsACString& aGenericFamily, - nsTArray& aListOfFonts); - nsresult UpdateFontList(); + nsTArray& aListOfFonts) MOZ_OVERRIDE; + nsresult UpdateFontList() MOZ_OVERRIDE; virtual void GetCommonFallbackFonts(uint32_t aCh, uint32_t aNextCh, int32_t aRunScript, - nsTArray& aFontList); + nsTArray& aFontList) MOZ_OVERRIDE; virtual bool CanRenderContentToDataSurface() const MOZ_OVERRIDE { return true; @@ -77,7 +77,7 @@ public: uint32_t GetAntiAliasingThreshold() { return mFontAntiAliasingThreshold; } private: - virtual void GetPlatformCMSOutputProfile(void* &mem, size_t &size); + virtual void GetPlatformCMSOutputProfile(void* &mem, size_t &size) MOZ_OVERRIDE; // read in the pref value for the lower threshold on font anti-aliasing static uint32_t ReadAntiAliasingThreshold(); diff --git a/gfx/thebes/gfxReusableImageSurfaceWrapper.h b/gfx/thebes/gfxReusableImageSurfaceWrapper.h index 07cd50290c5..6e05e71d8fd 100644 --- a/gfx/thebes/gfxReusableImageSurfaceWrapper.h +++ b/gfx/thebes/gfxReusableImageSurfaceWrapper.h @@ -26,7 +26,7 @@ public: void ReadLock() MOZ_OVERRIDE; void ReadUnlock() MOZ_OVERRIDE; - Type GetType() + Type GetType() MOZ_OVERRIDE { return TYPE_IMAGE; } diff --git a/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h b/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h index b6d49b9a3ad..8d1cb70914d 100644 --- a/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h +++ b/gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h @@ -37,7 +37,7 @@ public: void ReadLock() MOZ_OVERRIDE; void ReadUnlock() MOZ_OVERRIDE; - Type GetType() + Type GetType() MOZ_OVERRIDE { return TYPE_SHARED_IMAGE; } diff --git a/gfx/thebes/gfxVR.cpp b/gfx/thebes/gfxVR.cpp index a750cbf3f04..b4c1f8d1aa5 100644 --- a/gfx/thebes/gfxVR.cpp +++ b/gfx/thebes/gfxVR.cpp @@ -195,35 +195,35 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD GetRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) { + NS_IMETHOD GetRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) MOZ_OVERRIDE { *l = mScreenRect.x; *t = mScreenRect.y; *w = mScreenRect.width; *h = mScreenRect.height; return NS_OK; } - NS_IMETHOD GetAvailRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) { + NS_IMETHOD GetAvailRect(int32_t *l, int32_t *t, int32_t *w, int32_t *h) MOZ_OVERRIDE { return GetRect(l, t, w, h); } - NS_IMETHOD GetRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) { + NS_IMETHOD GetRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) MOZ_OVERRIDE { return GetRect(l, t, w, h); } - NS_IMETHOD GetAvailRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) { + NS_IMETHOD GetAvailRectDisplayPix(int32_t *l, int32_t *t, int32_t *w, int32_t *h) MOZ_OVERRIDE { return GetAvailRect(l, t, w, h); } - NS_IMETHOD GetId(uint32_t* aId) { *aId = (uint32_t)-1; return NS_OK; } - NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth) { *aPixelDepth = 24; return NS_OK; } - NS_IMETHOD GetColorDepth(int32_t* aColorDepth) { *aColorDepth = 24; return NS_OK; } + NS_IMETHOD GetId(uint32_t* aId) MOZ_OVERRIDE { *aId = (uint32_t)-1; return NS_OK; } + NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth) MOZ_OVERRIDE { *aPixelDepth = 24; return NS_OK; } + NS_IMETHOD GetColorDepth(int32_t* aColorDepth) MOZ_OVERRIDE { *aColorDepth = 24; return NS_OK; } - NS_IMETHOD LockMinimumBrightness(uint32_t aBrightness) { return NS_ERROR_NOT_AVAILABLE; } - NS_IMETHOD UnlockMinimumBrightness(uint32_t aBrightness) { return NS_ERROR_NOT_AVAILABLE; } - NS_IMETHOD GetRotation(uint32_t* aRotation) { + NS_IMETHOD LockMinimumBrightness(uint32_t aBrightness) MOZ_OVERRIDE { return NS_ERROR_NOT_AVAILABLE; } + NS_IMETHOD UnlockMinimumBrightness(uint32_t aBrightness) MOZ_OVERRIDE { return NS_ERROR_NOT_AVAILABLE; } + NS_IMETHOD GetRotation(uint32_t* aRotation) MOZ_OVERRIDE { *aRotation = nsIScreen::ROTATION_0_DEG; return NS_OK; } - NS_IMETHOD SetRotation(uint32_t aRotation) { return NS_ERROR_NOT_AVAILABLE; } - NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor) { + NS_IMETHOD SetRotation(uint32_t aRotation) MOZ_OVERRIDE { return NS_ERROR_NOT_AVAILABLE; } + NS_IMETHOD GetContentsScaleFactor(double* aContentsScaleFactor) MOZ_OVERRIDE { *aContentsScaleFactor = 1.0; return NS_OK; }