AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codec/SkCodec_libbmp.h
View File

@ -63,9 +63,9 @@ protected:
* Initiates the bmp decode
*
*/
virtual Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
size_t dstRowBytes, const Options&, SkPMColor*,
int*) override;
Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
size_t dstRowBytes, const Options&, SkPMColor*,
int*) override;
SkEncodedFormat onGetEncodedFormat() const override { return kBMP_SkEncodedFormat; }

6
src/image/SkImage_Raster.cpp
View File

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

3
src/image/SkSurface_Gpu.h
View File

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

3
src/image/SkSurface_Raster.cpp
View File

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

10
src/images/SkDecodingImageGenerator.cpp
View File

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

6
src/images/SkImageDecoder_libjpeg.cpp
View File

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

8
src/opts/SkXfermode_opts_SSE2.h
View File

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

8
src/opts/SkXfermode_opts_arm_neon.h
View File

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