aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkImageGenerator_skia.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/ports/SkImageGenerator_skia.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/ports/SkImageGenerator_skia.cpp')
-rw-r--r--src/ports/SkImageGenerator_skia.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ports/SkImageGenerator_skia.cpp b/src/ports/SkImageGenerator_skia.cpp
index 6938880357..3c2ce09281 100644
--- a/src/ports/SkImageGenerator_skia.cpp
+++ b/src/ports/SkImageGenerator_skia.cpp
@@ -21,7 +21,7 @@ public:
{}
protected:
- bool allocPixelRef(SkBitmap* bm, SkColorTable* ctable) SK_OVERRIDE {
+ bool allocPixelRef(SkBitmap* bm, SkColorTable* ctable) override {
const SkImageInfo bmi = bm->info();
if (bmi.width() != fInfo.width() || bmi.height() != fInfo.height() ||
bmi.colorType() != fInfo.colorType())
@@ -43,12 +43,12 @@ public:
{}
protected:
- SkData* onRefEncodedData() SK_OVERRIDE {
+ SkData* onRefEncodedData() override {
return SkRef(fData.get());
}
#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
- virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
+ virtual bool onGetInfo(SkImageInfo* info) override {
*info = fInfo;
return true;
}
@@ -56,7 +56,7 @@ protected:
virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
const Options&,
- SkPMColor ctableEntries[], int* ctableCount) SK_OVERRIDE {
+ SkPMColor ctableEntries[], int* ctableCount) override {
SkMemoryStream stream(fData->data(), fData->size(), false);
SkAutoTUnref<BareMemoryAllocator> allocator(SkNEW_ARGS(BareMemoryAllocator,
(info, pixels, rowBytes)));
@@ -90,7 +90,7 @@ protected:
}
bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
- SkYUVColorSpace* colorSpace) SK_OVERRIDE {
+ SkYUVColorSpace* colorSpace) override {
SkMemoryStream stream(fData->data(), fData->size(), false);
return fDecoder->decodeYUV8Planes(&stream, sizes, planes, rowBytes, colorSpace);
}