Update more directories under src/ to follow C++11 style rule for {virtual,override}.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

The entries were found using the following command line:

$ find src/ -iname "*.h" -o -iname "*.cpp" | xargs pcregrep -M
"[^\n/]+virtual\ [^;{]+\ [a-zA-Z0-9_]+\([^;{]+\ override[ \n]*[;{]"

The regex was a courtesy of nick@chromium.org

BUG=None
R=mtklein@google.com
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1086143003
This commit is contained in:
tfarina 2015-04-27 07:53:07 -07:00 committed by Commit bot
parent 567ff2f614
commit 7831a4bbb4
8 changed files with 24 additions and 26 deletions

View File

@ -63,7 +63,7 @@ protected:
* Initiates the bmp decode * Initiates the bmp decode
* *
*/ */
virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst, Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
size_t dstRowBytes, const Options&, SkPMColor*, size_t dstRowBytes, const Options&, SkPMColor*,
int*) override; int*) override;

View File

@ -66,7 +66,7 @@ public:
SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
virtual SkShader* onNewShader(SkShader::TileMode, SkShader* onNewShader(SkShader::TileMode,
SkShader::TileMode, SkShader::TileMode,
const SkMatrix* localMatrix) const override; const SkMatrix* localMatrix) const override;

View File

@ -24,8 +24,7 @@ public:
SkCanvas* onNewCanvas() override; SkCanvas* onNewCanvas() override;
SkSurface* onNewSurface(const SkImageInfo&) override; SkSurface* onNewSurface(const SkImageInfo&) override;
SkImage* onNewImageSnapshot(Budgeted) override; SkImage* onNewImageSnapshot(Budgeted) override;
virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) override;
const SkPaint*) override;
void onCopyOnWrite(ContentChangeMode) override; void onCopyOnWrite(ContentChangeMode) override;
void onDiscard() override; void onDiscard() override;

View File

@ -25,8 +25,7 @@ public:
SkCanvas* onNewCanvas() override; SkCanvas* onNewCanvas() override;
SkSurface* onNewSurface(const SkImageInfo&) override; SkSurface* onNewSurface(const SkImageInfo&) override;
SkImage* onNewImageSnapshot(Budgeted) override; SkImage* onNewImageSnapshot(Budgeted) override;
virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) override;
const SkPaint*) override;
void onCopyOnWrite(ContentChangeMode) override; void onCopyOnWrite(ContentChangeMode) override;
private: private:

View File

@ -44,10 +44,10 @@ protected:
return true; return true;
} }
#endif #endif
virtual Result onGetPixels(const SkImageInfo& info, Result onGetPixels(const SkImageInfo& info,
void* pixels, size_t rowBytes, const Options&, void* pixels, size_t rowBytes, const Options&,
SkPMColor ctable[], int* ctableCount) override; SkPMColor ctable[], int* ctableCount) override;
virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3], bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
SkYUVColorSpace* colorSpace) override; SkYUVColorSpace* colorSpace) override;
private: private:

View File

@ -242,7 +242,7 @@ protected:
bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) override; bool onDecodeSubset(SkBitmap* bitmap, const SkIRect& rect) override;
#endif #endif
Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override; Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
virtual bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3], bool onDecodeYUV8Planes(SkStream* stream, SkISize componentSizes[3],
void* planes[3], size_t rowBytes[3], void* planes[3], size_t rowBytes[3],
SkYUVColorSpace* colorSpace) override; SkYUVColorSpace* colorSpace) override;

View File

@ -17,9 +17,9 @@ public:
void* procSIMD) void* procSIMD)
: INHERITED(rec, mode), fProcSIMD(procSIMD) {} : INHERITED(rec, mode), fProcSIMD(procSIMD) {}
virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
const SkAlpha aa[]) const override; const SkAlpha aa[]) const override;
virtual void xfer16(uint16_t dst[], const SkPMColor src[], void xfer16(uint16_t dst[], const SkPMColor src[],
int count, const SkAlpha aa[]) const override; int count, const SkAlpha aa[]) const override;
SK_TO_STRING_OVERRIDE() SK_TO_STRING_OVERRIDE()

View File

@ -9,9 +9,9 @@ public:
void* procSIMD) void* procSIMD)
: INHERITED(rec, mode), fProcSIMD(procSIMD) {} : INHERITED(rec, mode), fProcSIMD(procSIMD) {}
virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
const SkAlpha aa[]) const override; const SkAlpha aa[]) const override;
virtual void xfer16(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, void xfer16(uint16_t* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src,
int count, const SkAlpha* SK_RESTRICT aa) const override; int count, const SkAlpha* SK_RESTRICT aa) const override;
SK_TO_STRING_OVERRIDE() SK_TO_STRING_OVERRIDE()