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
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 45e6cc3..e55451e 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -1273,13 +1273,13 @@
Instead we'll rely on the runtime asserts to guarantee Y monotonicity;
any failure cases that misses may have minor artifacts.
*/
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+ void blitV(int x, int y, int height, SkAlpha alpha) override {
this->recordMinY(y);
fBuilder->addColumn(x, y, alpha, height);
fLastY = y + height - 1;
}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
this->recordMinY(y);
this->checkForYGap(y);
fBuilder->addRectRun(x, y, width, height);
@@ -1287,28 +1287,28 @@
}
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE {
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override {
this->recordMinY(y);
this->checkForYGap(y);
fBuilder->addAntiRectRun(x, y, width, height, leftAlpha, rightAlpha);
fLastY = y + height - 1;
}
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE
+ void blitMask(const SkMask&, const SkIRect& clip) override
{ unexpected(); }
- const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE {
+ const SkBitmap* justAnOpaqueColor(uint32_t*) override {
return NULL;
}
- void blitH(int x, int y, int width) SK_OVERRIDE {
+ void blitH(int x, int y, int width) override {
this->recordMinY(y);
this->checkForYGap(y);
fBuilder->addRun(x, y, 0xFF, width);
}
virtual void blitAntiH(int x, int y, const SkAlpha alpha[],
- const int16_t runs[]) SK_OVERRIDE {
+ const int16_t runs[]) override {
this->recordMinY(y);
this->checkForYGap(y);
for (;;) {
diff --git a/src/core/SkAAClip.h b/src/core/SkAAClip.h
index 67f45e4..1daeb38 100644
--- a/src/core/SkAAClip.h
+++ b/src/core/SkAAClip.h
@@ -109,13 +109,13 @@
fAAClipBounds = aaclip->getBounds();
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
private:
SkBlitter* fBlitter;
diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index f569db8..aabf87a 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -71,8 +71,8 @@
, fBitmap(result)
{}
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fBitmap.getSize(); }
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override { return sizeof(fKey) + fBitmap.getSize(); }
static bool Finder(const SkResourceCache::Rec& baseRec, void* contextBitmap) {
const BitmapRec& rec = static_cast<const BitmapRec&>(baseRec);
@@ -171,8 +171,8 @@
fMipMap->detachFromCacheAndUnref();
}
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE { return sizeof(fKey) + fMipMap->size(); }
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override { return sizeof(fKey) + fMipMap->size(); }
static bool Finder(const SkResourceCache::Rec& baseRec, void* contextMip) {
const MipMapRec& rec = static_cast<const MipMapRec&>(baseRec);
diff --git a/src/core/SkBitmapFilter.h b/src/core/SkBitmapFilter.h
index 139e990..93b552e 100644
--- a/src/core/SkBitmapFilter.h
+++ b/src/core/SkBitmapFilter.h
@@ -79,7 +79,7 @@
: SkBitmapFilter(width), B(b), C(c) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
x = fabsf(x);
if (x > 2.f) {
return 0;
@@ -102,7 +102,7 @@
: SkBitmapFilter(width), alpha(a), expWidth(expf(-alpha * width * width)) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
return SkTMax(0.f, float(expf(-alpha*x*x) - expWidth));
}
protected:
@@ -115,7 +115,7 @@
: SkBitmapFilter(width) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
return SkTMax(0.f, fWidth - fabsf(x));
}
protected:
@@ -127,7 +127,7 @@
: SkBitmapFilter(width) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
return (x >= -fWidth && x < fWidth) ? 1.0f : 0.0f;
}
protected:
@@ -138,7 +138,7 @@
SkHammingFilter(float width=1.f)
: SkBitmapFilter(width) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
if (x <= -fWidth || x >= fWidth) {
return 0.0f; // Outside of the window.
}
@@ -158,7 +158,7 @@
: SkBitmapFilter(width) {
}
- float evaluate(float x) const SK_OVERRIDE {
+ float evaluate(float x) const override {
if (x <= -fWidth || x >= fWidth) {
return 0.0f; // Outside of the window.
}
diff --git a/src/core/SkBitmapHeap.h b/src/core/SkBitmapHeap.h
index 95e2724..fe171ff 100644
--- a/src/core/SkBitmapHeap.h
+++ b/src/core/SkBitmapHeap.h
@@ -117,7 +117,7 @@
*
* @return The bitmap located at that slot or NULL if external storage is being used.
*/
- SkBitmap* getBitmap(int32_t slot) const SK_OVERRIDE {
+ SkBitmap* getBitmap(int32_t slot) const override {
SkASSERT(fExternalStorage == NULL);
SkBitmapHeapEntry* entry = getEntry(slot);
if (entry) {
@@ -131,7 +131,7 @@
*
* @return The bitmap located at that slot or NULL if external storage is being used.
*/
- void releaseRef(int32_t slot) SK_OVERRIDE {
+ void releaseRef(int32_t slot) override {
SkASSERT(fExternalStorage == NULL);
if (fOwnerCount != IGNORE_OWNERS) {
SkBitmapHeapEntry* entry = getEntry(slot);
diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index f73d56f..bdb2d4d 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -20,10 +20,10 @@
const SkMatrix* localMatrix = NULL);
// overrides from SkShader
- bool isOpaque() const SK_OVERRIDE;
- BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const SK_OVERRIDE;
+ bool isOpaque() const override;
+ BitmapType asABitmap(SkBitmap*, SkMatrix*, TileMode*) const override;
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
static bool CanDo(const SkBitmap&, TileMode tx, TileMode ty);
@@ -32,7 +32,7 @@
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
- GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
+ GrColor*, GrFragmentProcessor**) const override;
class BitmapProcShaderContext : public SkShader::Context {
public:
@@ -41,11 +41,11 @@
BitmapProcShaderContext(const SkBitmapProcShader&, const ContextRec&, SkBitmapProcState*);
virtual ~BitmapProcShaderContext();
- void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+ ShadeProc asAShadeProc(void** ctx) override;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
- uint32_t getFlags() const SK_OVERRIDE { return fFlags; }
+ uint32_t getFlags() const override { return fFlags; }
private:
SkBitmapProcState* fState;
@@ -55,8 +55,8 @@
};
protected:
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
SkBitmap fRawBitmap; // experimental for RLE encoding
uint8_t fTileModeX, fTileModeY;
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index a5d2b05..d8553f1 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -580,7 +580,7 @@
SkSafeUnref(fProxy);
}
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
size_t size = sizeof(Sk3DShaderContext);
if (fProxy) {
size += fProxy->contextSize();
@@ -588,7 +588,7 @@
return size;
}
- Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
+ Context* onCreateContext(const ContextRec& rec, void* storage) const override {
SkShader::Context* proxyContext = NULL;
if (fProxy) {
char* proxyContextStorage = (char*) storage + sizeof(Sk3DShaderContext);
@@ -620,9 +620,9 @@
}
}
- void set3DMask(const SkMask* mask) SK_OVERRIDE { fMask = mask; }
+ void set3DMask(const SkMask* mask) override { fMask = mask; }
- void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE {
+ void shadeSpan(int x, int y, SkPMColor span[], int count) override {
if (fProxyContext) {
fProxyContext->shadeSpan(x, y, span, count);
}
@@ -697,7 +697,7 @@
};
#ifndef SK_IGNORE_TO_STRING
- void toString(SkString* str) const SK_OVERRIDE {
+ void toString(SkString* str) const override {
str->append("Sk3DShader: (");
if (fProxy) {
@@ -714,7 +714,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Sk3DShader)
protected:
- void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer& buffer) const override {
buffer.writeFlattenable(fProxy);
}
@@ -736,24 +736,24 @@
, fShaderContext(shaderContext)
{}
- void blitH(int x, int y, int width) SK_OVERRIDE {
+ void blitH(int x, int y, int width) override {
fProxy->blitH(x, y, width);
}
virtual void blitAntiH(int x, int y, const SkAlpha antialias[],
- const int16_t runs[]) SK_OVERRIDE {
+ const int16_t runs[]) override {
fProxy->blitAntiH(x, y, antialias, runs);
}
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+ void blitV(int x, int y, int height, SkAlpha alpha) override {
fProxy->blitV(x, y, height, alpha);
}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
fProxy->blitRect(x, y, width, height);
}
- void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE {
+ void blitMask(const SkMask& mask, const SkIRect& clip) override {
if (mask.fFormat == SkMask::k3D_Format) {
fShaderContext->set3DMask(&mask);
@@ -991,7 +991,7 @@
// Override rec with the identity matrix, so it is guaranteed to be invertible.
: INHERITED(shader, SkShader::ContextRec(*rec.fDevice, *rec.fPaint, SkMatrix::I())) {}
- void shadeSpan(int x, int y, SkPMColor colors[], int count) SK_OVERRIDE {
+ void shadeSpan(int x, int y, SkPMColor colors[], int count) override {
sk_bzero(colors, count * sizeof(SkPMColor));
}
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h
index b0745c8..9447bf1 100644
--- a/src/core/SkBlitter.h
+++ b/src/core/SkBlitter.h
@@ -119,14 +119,14 @@
*/
class SkNullBlitter : public SkBlitter {
public:
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
- bool isNullBlitter() const SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
+ bool isNullBlitter() const override;
};
/** Wraps another (real) blitter, and ensures that the real blitter is only
@@ -141,21 +141,21 @@
fClipRect = clipRect;
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
- int requestRowsPreserved() const SK_OVERRIDE {
+ int requestRowsPreserved() const override {
return fBlitter->requestRowsPreserved();
}
- void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+ void* allocBlitMemory(size_t sz) override {
return fBlitter->allocBlitMemory(sz);
}
@@ -176,21 +176,21 @@
fRgn = clipRgn;
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha[],
- const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE;
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override;
+ void blitMask(const SkMask&, const SkIRect& clip) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override;
- int requestRowsPreserved() const SK_OVERRIDE {
+ int requestRowsPreserved() const override {
return fBlitter->requestRowsPreserved();
}
- void* allocBlitMemory(size_t sz) SK_OVERRIDE {
+ void* allocBlitMemory(size_t sz) override {
return fBlitter->allocBlitMemory(sz);
}
diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp
index 306c95b..ed9e103 100644
--- a/src/core/SkBlitter_RGB16.cpp
+++ b/src/core/SkBlitter_RGB16.cpp
@@ -59,14 +59,14 @@
class SkRGB16_Blitter : public SkRasterBlitter {
public:
SkRGB16_Blitter(const SkBitmap& device, const SkPaint& paint);
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t* runs) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitMask(const SkMask&,
- const SkIRect&) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE;
+ const SkIRect&) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t*) override;
protected:
SkPMColor fSrcColor32;
@@ -88,13 +88,13 @@
class SkRGB16_Opaque_Blitter : public SkRGB16_Blitter {
public:
SkRGB16_Opaque_Blitter(const SkBitmap& device, const SkPaint& paint);
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t* runs) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
virtual void blitMask(const SkMask&,
- const SkIRect&) SK_OVERRIDE;
+ const SkIRect&) override;
private:
typedef SkRGB16_Blitter INHERITED;
@@ -104,9 +104,9 @@
class SkRGB16_Black_Blitter : public SkRGB16_Opaque_Blitter {
public:
SkRGB16_Black_Blitter(const SkBitmap& device, const SkPaint& paint);
- void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE;
+ void blitMask(const SkMask&, const SkIRect&) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
+ const int16_t* runs) override;
private:
typedef SkRGB16_Opaque_Blitter INHERITED;
@@ -118,10 +118,10 @@
SkRGB16_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
SkShader::Context* shaderContext);
virtual ~SkRGB16_Shader_Blitter();
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t* runs) override;
+ void blitRect(int x, int y, int width, int height) override;
protected:
SkPMColor* fBuffer;
@@ -140,10 +140,10 @@
public:
SkRGB16_Shader16_Blitter(const SkBitmap& device, const SkPaint& paint,
SkShader::Context* shaderContext);
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ const int16_t* runs) override;
+ void blitRect(int x, int y, int width, int height) override;
private:
typedef SkRGB16_Shader_Blitter INHERITED;
@@ -154,9 +154,9 @@
SkRGB16_Shader_Xfermode_Blitter(const SkBitmap& device, const SkPaint& paint,
SkShader::Context* shaderContext);
virtual ~SkRGB16_Shader_Xfermode_Blitter();
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
virtual void blitAntiH(int x, int y, const SkAlpha* antialias,
- const int16_t* runs) SK_OVERRIDE;
+ const int16_t* runs) override;
private:
SkXfermode* fXfermode;
diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h
index 96e225b..aaafb36 100644
--- a/src/core/SkBuffer.h
+++ b/src/core/SkBuffer.h
@@ -105,7 +105,7 @@
null and the number of bytes to read does not overflow this object's data,
copy those bytes into buffer.
*/
- bool read(void* buffer, size_t size) SK_OVERRIDE;
+ bool read(void* buffer, size_t size) override;
/** Returns whether or not a read operation attempted to read past the end of the data.
*/
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 45950ad..8007271 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -42,18 +42,18 @@
class SkComposeColorFilter : public SkColorFilter {
public:
- uint32_t getFlags() const SK_OVERRIDE {
+ uint32_t getFlags() const override {
// Can only claim alphaunchanged and 16bit support if both our proxys do.
return fOuter->getFlags() & fInner->getFlags();
}
- void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE {
+ void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override {
fInner->filterSpan(shader, count, result);
fOuter->filterSpan(result, count, result);
}
#ifndef SK_IGNORE_TO_STRING
- void toString(SkString* str) const SK_OVERRIDE {
+ void toString(SkString* str) const override {
SkString outerS, innerS;
fOuter->toString(&outerS);
fInner->toString(&innerS);
@@ -63,7 +63,7 @@
#if SK_SUPPORT_GPU
bool asFragmentProcessors(GrContext* context,
- SkTDArray<GrFragmentProcessor*>* array) const SK_OVERRIDE {
+ SkTDArray<GrFragmentProcessor*>* array) const override {
bool hasFrags = fInner->asFragmentProcessors(context, array);
hasFrags |= fOuter->asFragmentProcessors(context, array);
return hasFrags;
@@ -73,7 +73,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeColorFilter)
protected:
- void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer& buffer) const override {
buffer.writeFlattenable(fOuter);
buffer.writeFlattenable(fInner);
}
@@ -88,7 +88,7 @@
SkASSERT(composedFilterCount <= SK_MAX_COMPOSE_COLORFILTER_COUNT);
}
- int privateComposedFilterCount() const SK_OVERRIDE {
+ int privateComposedFilterCount() const override {
return fComposedFilterCount;
}
diff --git a/src/core/SkColorShader.h b/src/core/SkColorShader.h
index 9fbd5e1..918e19e 100644
--- a/src/core/SkColorShader.h
+++ b/src/core/SkColorShader.h
@@ -23,9 +23,9 @@
*/
explicit SkColorShader(SkColor c);
- bool isOpaque() const SK_OVERRIDE;
+ bool isOpaque() const override;
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
return sizeof(ColorShaderContext);
}
@@ -33,11 +33,11 @@
public:
ColorShaderContext(const SkColorShader& shader, const ContextRec&);
- uint32_t getFlags() const SK_OVERRIDE;
- uint8_t getSpan16Alpha() const SK_OVERRIDE;
- void shadeSpan(int x, int y, SkPMColor span[], int count) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
- void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) SK_OVERRIDE;
+ uint32_t getFlags() const override;
+ uint8_t getSpan16Alpha() const override;
+ void shadeSpan(int x, int y, SkPMColor span[], int count) override;
+ void shadeSpan16(int x, int y, uint16_t span[], int count) override;
+ void shadeSpanAlpha(int x, int y, uint8_t alpha[], int count) override;
private:
SkPMColor fPMColor;
@@ -50,22 +50,22 @@
// we return false for this, use asAGradient
virtual BitmapType asABitmap(SkBitmap* outTexture,
SkMatrix* outMatrix,
- TileMode xy[2]) const SK_OVERRIDE;
+ TileMode xy[2]) const override;
- GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+ GradientType asAGradient(GradientInfo* info) const override;
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM,
const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const SK_OVERRIDE;
+ GrFragmentProcessor**) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
protected:
SkColorShader(SkReadBuffer&);
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
- bool onAsLuminanceColor(SkColor* lum) const SK_OVERRIDE {
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
+ bool onAsLuminanceColor(SkColor* lum) const override {
*lum = fColor;
return true;
}
diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h
index e6be38a..f4a5d6f 100644
--- a/src/core/SkCoreBlitters.h
+++ b/src/core/SkCoreBlitters.h
@@ -41,9 +41,9 @@
* Will create the context at the same location as the old one (this is safe
* because the shader itself is unchanged).
*/
- bool resetShaderContext(const SkShader::ContextRec&) SK_OVERRIDE;
+ bool resetShaderContext(const SkShader::ContextRec&) override;
- SkShader::Context* getShaderContext() const SK_OVERRIDE { return fShaderContext; }
+ SkShader::Context* getShaderContext() const override { return fShaderContext; }
protected:
uint32_t fShaderFlags;
@@ -62,12 +62,12 @@
class SkA8_Coverage_Blitter : public SkRasterBlitter {
public:
SkA8_Coverage_Blitter(const SkBitmap& device, const SkPaint& paint);
- void blitH(int x, int y, int width) SK_OVERRIDE;
- void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE;
- const SkBitmap* justAnOpaqueColor(uint32_t*) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
+ void blitAntiH(int x, int y, const SkAlpha antialias[], const int16_t runs[]) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
+ void blitMask(const SkMask&, const SkIRect&) override;
+ const SkBitmap* justAnOpaqueColor(uint32_t*) override;
};
class SkA8_Blitter : public SkRasterBlitter {
@@ -160,11 +160,11 @@
SkARGB32_Shader_Blitter(const SkBitmap& device, const SkPaint& paint,
SkShader::Context* shaderContext);
virtual ~SkARGB32_Shader_Blitter();
- void blitH(int x, int y, int width) SK_OVERRIDE;
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE;
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
- void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) SK_OVERRIDE;
- void blitMask(const SkMask&, const SkIRect&) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
+ void blitV(int x, int y, int height, SkAlpha alpha) override;
+ void blitRect(int x, int y, int width, int height) override;
+ void blitAntiH(int x, int y, const SkAlpha[], const int16_t[]) override;
+ void blitMask(const SkMask&, const SkIRect&) override;
private:
SkXfermode* fXfermode;
diff --git a/src/core/SkDeviceImageFilterProxy.h b/src/core/SkDeviceImageFilterProxy.h
index 909e60d..aa2fd1a 100644
--- a/src/core/SkDeviceImageFilterProxy.h
+++ b/src/core/SkDeviceImageFilterProxy.h
@@ -19,22 +19,22 @@
, fProps(props.flags(), kUnknown_SkPixelGeometry)
{}
- SkBaseDevice* createDevice(int w, int h) SK_OVERRIDE {
+ SkBaseDevice* createDevice(int w, int h) override {
SkBaseDevice::CreateInfo cinfo(SkImageInfo::MakeN32Premul(w, h),
SkBaseDevice::kPossible_TileUsage,
kUnknown_SkPixelGeometry);
return fDevice->onCreateDevice(cinfo, NULL);
}
- bool canHandleImageFilter(const SkImageFilter* filter) SK_OVERRIDE {
+ bool canHandleImageFilter(const SkImageFilter* filter) override {
return fDevice->canHandleImageFilter(filter);
}
virtual bool filterImage(const SkImageFilter* filter, const SkBitmap& src,
const SkImageFilter::Context& ctx,
- SkBitmap* result, SkIPoint* offset) SK_OVERRIDE {
+ SkBitmap* result, SkIPoint* offset) override {
return fDevice->filterImage(filter, src, ctx, result, offset);
}
- const SkSurfaceProps* surfaceProps() const SK_OVERRIDE {
+ const SkSurfaceProps* surfaceProps() const override {
return &fProps;
}
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 7744b99..c4c1bc5 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1900,7 +1900,7 @@
public:
SkTriColorShader() {}
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
class TriColorShaderContext : public SkShader::Context {
public:
@@ -1909,7 +1909,7 @@
bool setup(const SkPoint pts[], const SkColor colors[], int, int, int);
- void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
private:
SkMatrix fDstToUnit;
@@ -1921,10 +1921,10 @@
SK_TO_STRING_OVERRIDE()
// For serialization. This will never be called.
- Factory getFactory() const SK_OVERRIDE { sk_throw(); return NULL; }
+ Factory getFactory() const override { sk_throw(); return NULL; }
protected:
- Context* onCreateContext(const ContextRec& rec, void* storage) const SK_OVERRIDE {
+ Context* onCreateContext(const ContextRec& rec, void* storage) const override {
return SkNEW_PLACEMENT_ARGS(storage, TriColorShaderContext, (*this, rec));
}
diff --git a/src/core/SkEmptyShader.h b/src/core/SkEmptyShader.h
index 0de85ca..8809d5f 100644
--- a/src/core/SkEmptyShader.h
+++ b/src/core/SkEmptyShader.h
@@ -20,7 +20,7 @@
public:
SkEmptyShader() {}
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
// Even though createContext returns NULL we have to return a value of at least
// sizeof(SkShader::Context) to satisfy SkSmallAllocator.
return sizeof(SkShader::Context);
@@ -30,7 +30,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
protected:
- SkShader::Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE {
+ SkShader::Context* onCreateContext(const ContextRec&, void*) const override {
return NULL;
}
diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h
index 65291c8..ea5eaed 100644
--- a/src/core/SkFilterShader.h
+++ b/src/core/SkFilterShader.h
@@ -17,7 +17,7 @@
SkFilterShader(SkShader* shader, SkColorFilter* filter);
virtual ~SkFilterShader();
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
class FilterShaderContext : public SkShader::Context {
public:
@@ -25,11 +25,11 @@
FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&);
virtual ~FilterShaderContext();
- uint32_t getFlags() const SK_OVERRIDE;
+ uint32_t getFlags() const override;
- void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
+ void shadeSpan(int x, int y, SkPMColor[], int count) override;
- void set3DMask(const SkMask* mask) SK_OVERRIDE {
+ void set3DMask(const SkMask* mask) override {
// forward to our proxy
fShaderContext->set3DMask(mask);
}
@@ -44,8 +44,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader)
protected:
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
private:
diff --git a/src/core/SkFlate.h b/src/core/SkFlate.h
index e9c40ae..35f1849 100644
--- a/src/core/SkFlate.h
+++ b/src/core/SkFlate.h
@@ -66,8 +66,8 @@
void finalize();
// The SkWStream interface:
- bool write(const void*, size_t) SK_OVERRIDE;
- size_t bytesWritten() const SK_OVERRIDE;
+ bool write(const void*, size_t) override;
+ size_t bytesWritten() const override;
private:
struct Impl;
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
index 4e0f549..a03e05e 100644
--- a/src/core/SkFontMgr.cpp
+++ b/src/core/SkFontMgr.cpp
@@ -15,15 +15,15 @@
class SkEmptyFontStyleSet : public SkFontStyleSet {
public:
- int count() SK_OVERRIDE { return 0; }
- void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
+ int count() override { return 0; }
+ void getStyle(int, SkFontStyle*, SkString*) override {
SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set");
}
- SkTypeface* createTypeface(int index) SK_OVERRIDE {
+ SkTypeface* createTypeface(int index) override {
SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set");
return NULL;
}
- SkTypeface* matchStyle(const SkFontStyle&) SK_OVERRIDE {
+ SkTypeface* matchStyle(const SkFontStyle&) override {
return NULL;
}
};
@@ -36,46 +36,46 @@
class SkEmptyFontMgr : public SkFontMgr {
protected:
- int onCountFamilies() const SK_OVERRIDE {
+ int onCountFamilies() const override {
return 0;
}
- void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE {
+ void onGetFamilyName(int index, SkString* familyName) const override {
SkDEBUGFAIL("onGetFamilyName called with bad index");
}
- SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE {
+ SkFontStyleSet* onCreateStyleSet(int index) const override {
SkDEBUGFAIL("onCreateStyleSet called with bad index");
return NULL;
}
- SkFontStyleSet* onMatchFamily(const char[]) const SK_OVERRIDE {
+ SkFontStyleSet* onMatchFamily(const char[]) const override {
return SkFontStyleSet::CreateEmpty();
}
virtual SkTypeface* onMatchFamilyStyle(const char[],
- const SkFontStyle&) const SK_OVERRIDE {
+ const SkFontStyle&) const override {
return NULL;
}
virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[],
const SkFontStyle& style,
const char* bcp47[],
int bcp47Count,
- SkUnichar character) const SK_OVERRIDE {
+ SkUnichar character) const override {
return NULL;
}
virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
- const SkFontStyle&) const SK_OVERRIDE {
+ const SkFontStyle&) const override {
return NULL;
}
- SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromData(SkData*, int) const override {
return NULL;
}
- SkTypeface* onCreateFromStream(SkStreamAsset* stream, int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromStream(SkStreamAsset* stream, int) const override {
SkDELETE(stream);
return NULL;
}
- SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {
+ SkTypeface* onCreateFromFile(const char[], int) const override {
return NULL;
}
- SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE {
+ SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const override {
return NULL;
}
};
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index fd98911..d51d9c8 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -440,7 +440,7 @@
}
SK_DECLARE_INTERNAL_LLIST_INTERFACE(Value);
};
- bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
+ bool get(const Key& key, SkBitmap* result, SkIPoint* offset) const override {
SkAutoMutexAcquire mutex(fMutex);
if (Value* v = fLookup.find(key)) {
*result = v->fBitmap;
@@ -453,7 +453,7 @@
}
return false;
}
- void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE {
+ void set(const Key& key, const SkBitmap& result, const SkIPoint& offset) override {
SkAutoMutexAcquire mutex(fMutex);
if (Value* v = fLookup.find(key)) {
removeInternal(v);
diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h
index be78bee..1a46994 100644
--- a/src/core/SkLocalMatrixShader.h
+++ b/src/core/SkLocalMatrixShader.h
@@ -19,16 +19,16 @@
, fProxyShader(SkRef(proxy))
{}
- size_t contextSize() const SK_OVERRIDE {
+ size_t contextSize() const override {
return fProxyShader->contextSize();
}
virtual BitmapType asABitmap(SkBitmap* bitmap, SkMatrix* matrix,
- TileMode* mode) const SK_OVERRIDE {
+ TileMode* mode) const override {
return fProxyShader->asABitmap(bitmap, matrix, mode);
}
- GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE {
+ GradientType asAGradient(GradientInfo* info) const override {
return fProxyShader->asAGradient(info);
}
@@ -36,7 +36,7 @@
virtual bool asFragmentProcessor(GrContext* context, const SkPaint& paint,
const SkMatrix& viewM, const SkMatrix* localMatrix,
- GrColor* grColor, GrFragmentProcessor** fp) const SK_OVERRIDE {
+ GrColor* grColor, GrFragmentProcessor** fp) const override {
SkMatrix tmp = this->getLocalMatrix();
if (localMatrix) {
tmp.preConcat(*localMatrix);
@@ -48,14 +48,14 @@
virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&,
const SkMatrix*, GrColor*,
- GrFragmentProcessor**) const SK_OVERRIDE {
+ GrFragmentProcessor**) const override {
SkDEBUGFAIL("Should not call in GPU-less build");
return false;
}
#endif
- SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const SK_OVERRIDE {
+ SkShader* refAsALocalMatrixShader(SkMatrix* localMatrix) const override {
if (localMatrix) {
*localMatrix = this->getLocalMatrix();
}
@@ -66,8 +66,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLocalMatrixShader)
protected:
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void*) const override;
private:
SkAutoTUnref<SkShader> fProxyShader;
diff --git a/src/core/SkMaskCache.cpp b/src/core/SkMaskCache.cpp
index b0399b1..31a789f 100644
--- a/src/core/SkMaskCache.cpp
+++ b/src/core/SkMaskCache.cpp
@@ -51,8 +51,8 @@
RRectBlurKey fKey;
MaskValue fValue;
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); }
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
const RRectBlurRec& rec = static_cast<const RRectBlurRec&>(baseRec);
@@ -142,8 +142,8 @@
RectsBlurKey fKey;
MaskValue fValue;
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); }
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
const RectsBlurRec& rec = static_cast<const RectsBlurRec&>(baseRec);
diff --git a/src/core/SkMaskGamma.cpp b/src/core/SkMaskGamma.cpp
index abc729b..bbe72c4 100644
--- a/src/core/SkMaskGamma.cpp
+++ b/src/core/SkMaskGamma.cpp
@@ -12,27 +12,27 @@
#include "SkMaskGamma.h"
class SkLinearColorSpaceLuminance : public SkColorSpaceLuminance {
- SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE {
+ SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const override {
SkASSERT(SK_Scalar1 == gamma);
return luminance;
}
- SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE {
+ SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const override {
SkASSERT(SK_Scalar1 == gamma);
return luma;
}
};
class SkGammaColorSpaceLuminance : public SkColorSpaceLuminance {
- SkScalar toLuma(SkScalar gamma, SkScalar luminance) const SK_OVERRIDE {
+ SkScalar toLuma(SkScalar gamma, SkScalar luminance) const override {
return SkScalarPow(luminance, gamma);
}
- SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE {
+ SkScalar fromLuma(SkScalar gamma, SkScalar luma) const override {
return SkScalarPow(luma, SkScalarInvert(gamma));
}
};
class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance {
- SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE {
+ SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const override {
SkASSERT(0 == gamma);
//The magic numbers are derived from the sRGB specification.
//See http://www.color.org/chardata/rgb/srgb.xalter .
@@ -42,7 +42,7 @@
return SkScalarPow((luminance + 0.055f) / 1.055f,
2.4f);
}
- SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE {
+ SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const override {
SkASSERT(0 == gamma);
//The magic numbers are derived from the sRGB specification.
//See http://www.color.org/chardata/rgb/srgb.xalter .
diff --git a/src/core/SkMatrixImageFilter.h b/src/core/SkMatrixImageFilter.h
index 2c11aa6..012a360 100644
--- a/src/core/SkMatrixImageFilter.h
+++ b/src/core/SkMatrixImageFilter.h
@@ -40,7 +40,7 @@
#endif
virtual ~SkMatrixImageFilter();
- void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
+ void computeFastBounds(const SkRect&, SkRect*) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixImageFilter)
@@ -49,12 +49,12 @@
SkMatrixImageFilter(const SkMatrix& transform,
SkFilterQuality,
SkImageFilter* input);
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
+ SkBitmap* result, SkIPoint* loc) const override;
virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
- SkIRect* dst) const SK_OVERRIDE;
+ SkIRect* dst) const override;
private:
SkMatrix fTransform;
diff --git a/src/core/SkMipMap.h b/src/core/SkMipMap.h
index d403968..e22c0a2 100644
--- a/src/core/SkMipMap.h
+++ b/src/core/SkMipMap.h
@@ -30,7 +30,7 @@
bool extractLevel(SkScalar scale, Level*) const;
protected:
- void onDataChange(void* oldData, void* newData) SK_OVERRIDE {
+ void onDataChange(void* oldData, void* newData) override {
fLevels = (Level*)newData; // could be NULL
}
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index 3ce0007..5e2d5a1 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -29,9 +29,9 @@
SkPictureRecord(const SkISize& dimensions, uint32_t recordFlags);
virtual ~SkPictureRecord();
- void beginCommentGroup(const char* description) SK_OVERRIDE;
- void addComment(const char* kywd, const char* value) SK_OVERRIDE;
- void endCommentGroup() SK_OVERRIDE;
+ void beginCommentGroup(const char* description) override;
+ void addComment(const char* kywd, const char* value) override;
+ void endCommentGroup() override;
const SkTDArray<const SkPicture* >& getPictureRefs() const {
return fPictureRefs;
@@ -146,65 +146,65 @@
SkASSERT(fWriter.bytesWritten() == initialOffset + size);
}
- SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
- const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE {
+ SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+ const void* onPeekPixels(SkImageInfo*, size_t*) override {
return NULL;
}
- void willSave() SK_OVERRIDE;
- SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
- void willRestore() SK_OVERRIDE;
+ void willSave() override;
+ SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+ void willRestore() override;
- void didConcat(const SkMatrix&) SK_OVERRIDE;
- void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+ void didConcat(const SkMatrix&) override;
+ void didSetMatrix(const SkMatrix&) override;
- void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
+ void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
- SkScalar constY, const SkPaint&) SK_OVERRIDE;
+ SkScalar constY, const SkPaint&) override;
virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+ const SkMatrix* matrix, const SkPaint&) override;
virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkXfermode* xmode,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
- void onDrawPaint(const SkPaint&) SK_OVERRIDE;
- void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE;
- void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE;
- void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE;
+ void onDrawPaint(const SkPaint&) override;
+ void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+ void onDrawRect(const SkRect&, const SkPaint&) override;
+ void onDrawOval(const SkRect&, const SkPaint&) override;
+ void onDrawRRect(const SkRRect&, const SkPaint&) override;
+ void onDrawPath(const SkPath&, const SkPaint&) override;
+ void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
- DrawBitmapRectFlags flags) SK_OVERRIDE;
+ DrawBitmapRectFlags flags) override;
#if 0
// rely on conversion to bitmap (for now)
- void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE;
+ void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
- const SkPaint*) SK_OVERRIDE;
+ const SkPaint*) override;
#endif
void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
- const SkPaint*) SK_OVERRIDE;
- void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE;
+ const SkPaint*) override;
+ void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
void onDrawVertices(VertexMode vmode, int vertexCount,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
- void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
- void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
- void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
- void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
+ void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
+ void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
+ void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
+ void onClipRegion(const SkRegion&, SkRegion::Op) override;
- void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
+ void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
int addPathToHeap(const SkPath& path); // does not write to ops stream
diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp
index 1972ad3..850be27 100644
--- a/src/core/SkPictureRecorder.cpp
+++ b/src/core/SkPictureRecorder.cpp
@@ -115,9 +115,9 @@
{}
protected:
- SkRect onGetBounds() SK_OVERRIDE { return fBounds; }
+ SkRect onGetBounds() override { return fBounds; }
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
SkDrawable* const* drawables = NULL;
int drawableCount = 0;
if (fDrawableList) {
@@ -127,7 +127,7 @@
SkRecordDraw(*fRecord, canvas, NULL, drawables, drawableCount, fBBH, NULL/*callback*/);
}
- SkPicture* onNewPictureSnapshot() SK_OVERRIDE {
+ SkPicture* onNewPictureSnapshot() override {
SkPicture::SnapshotArray* pictList = NULL;
if (fDrawableList) {
// TODO: should we plumb-down the BBHFactory and recordFlags from our host
diff --git a/src/core/SkPictureShader.cpp b/src/core/SkPictureShader.cpp
index 3734791..cd2301b 100644
--- a/src/core/SkPictureShader.cpp
+++ b/src/core/SkPictureShader.cpp
@@ -70,8 +70,8 @@
SkAutoTUnref<SkShader> fShader;
size_t fBitmapBytes;
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE {
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override {
return sizeof(fKey) + sizeof(SkShader) + fBitmapBytes;
}
diff --git a/src/core/SkPictureShader.h b/src/core/SkPictureShader.h
index 8df9f53..c40b01b 100644
--- a/src/core/SkPictureShader.h
+++ b/src/core/SkPictureShader.h
@@ -25,18 +25,18 @@
const SkRect*);
virtual ~SkPictureShader();
- size_t contextSize() const SK_OVERRIDE;
+ size_t contextSize() const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureShader)
bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix& viewM, const SkMatrix*,
- GrColor*, GrFragmentProcessor**) const SK_OVERRIDE;
+ GrColor*, GrFragmentProcessor**) const override;
protected:
SkPictureShader(SkReadBuffer&);
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
- Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
+ Context* onCreateContext(const ContextRec&, void* storage) const override;
private:
SkPictureShader(const SkPicture*, TileMode, TileMode, const SkMatrix*, const SkRect*);
@@ -54,11 +54,11 @@
virtual ~PictureShaderContext();
- uint32_t getFlags() const SK_OVERRIDE;
+ uint32_t getFlags() const override;
- ShadeProc asAShadeProc(void** ctx) SK_OVERRIDE;
- void shadeSpan(int x, int y, SkPMColor dstC[], int count) SK_OVERRIDE;
- void shadeSpan16(int x, int y, uint16_t dstC[], int count) SK_OVERRIDE;
+ ShadeProc asAShadeProc(void** ctx) override;
+ void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
+ void shadeSpan16(int x, int y, uint16_t dstC[], int count) override;
private:
PictureShaderContext(const SkPictureShader&, const ContextRec&, SkShader* bitmapShader);
diff --git a/src/core/SkRTree.h b/src/core/SkRTree.h
index 9a118d4..9db6d33 100644
--- a/src/core/SkRTree.h
+++ b/src/core/SkRTree.h
@@ -41,9 +41,9 @@
explicit SkRTree(SkScalar aspectRatio = 1);
virtual ~SkRTree() {}
- void insert(const SkRect[], int N) SK_OVERRIDE;
- void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE;
- size_t bytesUsed() const SK_OVERRIDE;
+ void insert(const SkRect[], int N) override;
+ void search(const SkRect& query, SkTDArray<unsigned>* results) const override;
+ size_t bytesUsed() const override;
// Methods and constants below here are only public for tests.
@@ -53,7 +53,7 @@
int getCount() const { return fCount; }
// Get the root bound.
- SkRect getRootBound() const SK_OVERRIDE;
+ SkRect getRootBound() const override;
// These values were empirically determined to produce reasonable performance in most cases.
static const int kMinChildren = 6,
diff --git a/src/core/SkRecorder.h b/src/core/SkRecorder.h
index 130dce9..834a2b6 100644
--- a/src/core/SkRecorder.h
+++ b/src/core/SkRecorder.h
@@ -45,76 +45,76 @@
// Make SkRecorder forget entirely about its SkRecord*; all calls to SkRecorder will fail.
void forgetRecord();
- void willSave() SK_OVERRIDE;
- SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) SK_OVERRIDE;
- void willRestore() SK_OVERRIDE {}
- void didRestore() SK_OVERRIDE;
+ void willSave() override;
+ SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SkCanvas::SaveFlags) override;
+ void willRestore() override {}
+ void didRestore() override;
- void didConcat(const SkMatrix&) SK_OVERRIDE;
- void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+ void didConcat(const SkMatrix&) override;
+ void didSetMatrix(const SkMatrix&) override;
- void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawDrawable(SkDrawable*) SK_OVERRIDE;
+ void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
+ void onDrawDrawable(SkDrawable*) override;
void onDrawText(const void* text,
size_t byteLength,
SkScalar x,
SkScalar y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawPosText(const void* text,
size_t byteLength,
const SkPoint pos[],
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawPosTextH(const void* text,
size_t byteLength,
const SkScalar xpos[],
SkScalar constY,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawTextOnPath(const void* text,
size_t byteLength,
const SkPath& path,
const SkMatrix* matrix,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawTextBlob(const SkTextBlob* blob,
SkScalar x,
SkScalar y,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkXfermode* xmode,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
- void onDrawPaint(const SkPaint&) SK_OVERRIDE;
- void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE;
- void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE;
- void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE;
- void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE;
+ void onDrawPaint(const SkPaint&) override;
+ void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
+ void onDrawRect(const SkRect&, const SkPaint&) override;
+ void onDrawOval(const SkRect&, const SkPaint&) override;
+ void onDrawRRect(const SkRRect&, const SkPaint&) override;
+ void onDrawPath(const SkPath&, const SkPaint&) override;
+ void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
- DrawBitmapRectFlags flags) SK_OVERRIDE;
- void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE;
+ DrawBitmapRectFlags flags) override;
+ void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
- const SkPaint*) SK_OVERRIDE;
+ const SkPaint*) override;
void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
- const SkPaint*) SK_OVERRIDE;
- void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE;
+ const SkPaint*) override;
+ void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
void onDrawVertices(VertexMode vmode, int vertexCount,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xmode,
const uint16_t indices[], int indexCount,
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
- void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
- void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
- void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE;
- void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE;
+ void onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+ void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+ void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) override;
+ void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) override;
- void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
+ void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
- void beginCommentGroup(const char*) SK_OVERRIDE;
- void addComment(const char*, const char*) SK_OVERRIDE;
- void endCommentGroup() SK_OVERRIDE;
+ void beginCommentGroup(const char*) override;
+ void addComment(const char*, const char*) override;
+ void endCommentGroup() override;
- SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE { return NULL; }
+ SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override { return NULL; }
private:
template <typename T>
diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp
index 5b665d4..ad01cac 100644
--- a/src/core/SkRegion_path.cpp
+++ b/src/core/SkRegion_path.cpp
@@ -43,7 +43,7 @@
void copyToRect(SkIRect*) const;
void copyToRgn(SkRegion::RunType runs[]) const;
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
#ifdef SK_DEBUG
void dump() const {
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index 43e752b..0fdb54b 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -80,9 +80,9 @@
~SkOneShotDiscardablePixelRef();
protected:
- bool onNewLockPixels(LockRec*) SK_OVERRIDE;
- void onUnlockPixels() SK_OVERRIDE;
- size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
+ bool onNewLockPixels(LockRec*) override;
+ void onUnlockPixels() override;
+ size_t getAllocatedSizeInBytes() const override;
private:
SkDiscardableMemory* fDM;
@@ -150,7 +150,7 @@
fFactory = factory;
}
- bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE;
+ bool allocPixelRef(SkBitmap*, SkColorTable*) override;
private:
SkResourceCache::DiscardableFactory fFactory;
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index e3b5d80..7747cae 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -843,21 +843,21 @@
: SkScalerContext(face, desc) {}
protected:
- unsigned generateGlyphCount() SK_OVERRIDE {
+ unsigned generateGlyphCount() override {
return 0;
}
- uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE {
+ uint16_t generateCharToGlyph(SkUnichar uni) override {
return 0;
}
- void generateAdvance(SkGlyph* glyph) SK_OVERRIDE {
+ void generateAdvance(SkGlyph* glyph) override {
glyph->zeroMetrics();
}
- void generateMetrics(SkGlyph* glyph) SK_OVERRIDE {
+ void generateMetrics(SkGlyph* glyph) override {
glyph->zeroMetrics();
}
- void generateImage(const SkGlyph& glyph) SK_OVERRIDE {}
- void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE {}
- void generateFontMetrics(SkPaint::FontMetrics* metrics) SK_OVERRIDE {
+ void generateImage(const SkGlyph& glyph) override {}
+ void generatePath(const SkGlyph& glyph, SkPath* path) override {}
+ void generateFontMetrics(SkPaint::FontMetrics* metrics) override {
if (metrics) {
sk_bzero(metrics, sizeof(*metrics));
}
diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp
index ed11f64..3f95a68 100644
--- a/src/core/SkScan_AntiPath.cpp
+++ b/src/core/SkScan_AntiPath.cpp
@@ -44,11 +44,11 @@
/// Must be explicitly defined on subclasses.
virtual void blitAntiH(int x, int y, const SkAlpha antialias[],
- const int16_t runs[]) SK_OVERRIDE {
+ const int16_t runs[]) override {
SkDEBUGFAIL("How did I get here?");
}
/// May not be called on BaseSuperBlitter because it blits out of order.
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+ void blitV(int x, int y, int height, SkAlpha alpha) override {
SkDEBUGFAIL("How did I get here?");
}
@@ -115,10 +115,10 @@
/// Blits a row of pixels, with location and width specified
/// in supersampled coordinates.
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
/// Blits a rectangle of pixels, with location and size specified
/// in supersampled coordinates.
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE;
+ void blitRect(int x, int y, int width, int height) override;
private:
// The next three variables are used to track a circular buffer that
@@ -400,7 +400,7 @@
fRealBlitter->blitMask(fMask, fClipRect);
}
- void blitH(int x, int y, int width) SK_OVERRIDE;
+ void blitH(int x, int y, int width) override;
static bool CanHandleRect(const SkIRect& bounds) {
#ifdef FORCE_RLE
diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp
index a3305e2..97bb6d2 100644
--- a/src/core/SkScan_Antihair.cpp
+++ b/src/core/SkScan_Antihair.cpp
@@ -106,7 +106,7 @@
class HLine_SkAntiHairBlitter : public SkAntiHairBlitter {
public:
- SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) SK_OVERRIDE {
+ SkFixed drawCap(int x, SkFixed fy, SkFixed slope, int mod64) override {
fy += SK_Fixed1/2;
int y = fy >> 16;
@@ -128,7 +128,7 @@
}
virtual SkFixed drawLine(int x, int stopx, SkFixed fy,
- SkFixed slope) SK_OVERRIDE {
+ SkFixed slope) override {
SkASSERT(x < stopx);
int count = stopx - x;
fy += SK_Fixed1/2;
@@ -153,7 +153,7 @@
class Horish_SkAntiHairBlitter : public SkAntiHairBlitter {
public:
- SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) SK_OVERRIDE {
+ SkFixed drawCap(int x, SkFixed fy, SkFixed dy, int mod64) override {
int16_t runs[2];
uint8_t aa[1];
@@ -186,7 +186,7 @@
return fy - SK_Fixed1/2;
}
- SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) SK_OVERRIDE {
+ SkFixed drawLine(int x, int stopx, SkFixed fy, SkFixed dy) override {
SkASSERT(x < stopx);
int16_t runs[2];
@@ -224,7 +224,7 @@
class VLine_SkAntiHairBlitter : public SkAntiHairBlitter {
public:
- SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
+ SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
SkASSERT(0 == dx);
fx += SK_Fixed1/2;
@@ -243,7 +243,7 @@
return fx - SK_Fixed1/2;
}
- SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+ SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
SkASSERT(y < stopy);
SkASSERT(0 == dx);
fx += SK_Fixed1/2;
@@ -265,7 +265,7 @@
class Vertish_SkAntiHairBlitter : public SkAntiHairBlitter {
public:
- SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) SK_OVERRIDE {
+ SkFixed drawCap(int y, SkFixed fx, SkFixed dx, int mod64) override {
int16_t runs[3];
uint8_t aa[2];
@@ -289,7 +289,7 @@
return fx - SK_Fixed1/2;
}
- SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) SK_OVERRIDE {
+ SkFixed drawLine(int y, int stopy, SkFixed fx, SkFixed dx) override {
SkASSERT(y < stopy);
int16_t runs[3];
uint8_t aa[2];
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp
index d51cb56..9b4b9fd 100644
--- a/src/core/SkScan_Path.cpp
+++ b/src/core/SkScan_Path.cpp
@@ -323,7 +323,7 @@
}
// overrides
- void blitH(int x, int y, int width) SK_OVERRIDE {
+ void blitH(int x, int y, int width) override {
int invWidth = x - fPrevX;
if (invWidth > 0) {
fBlitter->blitH(fPrevX, y, invWidth);
@@ -332,19 +332,19 @@
}
// we do not expect to get called with these entrypoints
- void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) SK_OVERRIDE {
+ void blitAntiH(int, int, const SkAlpha[], const int16_t runs[]) override {
SkDEBUGFAIL("blitAntiH unexpected");
}
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+ void blitV(int x, int y, int height, SkAlpha alpha) override {
SkDEBUGFAIL("blitV unexpected");
}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkDEBUGFAIL("blitRect unexpected");
}
- void blitMask(const SkMask&, const SkIRect& clip) SK_OVERRIDE {
+ void blitMask(const SkMask&, const SkIRect& clip) override {
SkDEBUGFAIL("blitMask unexpected");
}
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE {
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override {
SkDEBUGFAIL("justAnOpaqueColor unexpected");
return NULL;
}
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index 0993a4c..c3f63fe 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -34,7 +34,7 @@
fAlpha = alpha;
}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkASSERT(width > 0 && height > 0);
uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
@@ -92,7 +92,7 @@
}
virtual void setup(const SkBitmap& device, int left, int top,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
this->INHERITED::setup(device, left, top, paint);
int width = device.width();
@@ -122,7 +122,7 @@
Sprite_D32_S32A_XferFilter(const SkBitmap& source, const SkPaint& paint)
: Sprite_D32_XferFilter(source, paint) {}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkASSERT(width > 0 && height > 0);
uint32_t* SK_RESTRICT dst = fDevice->getAddr32(x, y);
const uint32_t* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
@@ -169,7 +169,7 @@
Sprite_D32_S4444_XferFilter(const SkBitmap& source, const SkPaint& paint)
: Sprite_D32_XferFilter(source, paint) {}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkASSERT(width > 0 && height > 0);
SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
@@ -216,7 +216,7 @@
public:
Sprite_D32_S4444_Opaque(const SkBitmap& source) : SkSpriteBlitter(source) {}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkASSERT(width > 0 && height > 0);
SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
@@ -245,7 +245,7 @@
public:
Sprite_D32_S4444(const SkBitmap& source) : SkSpriteBlitter(source) {}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
SkASSERT(width > 0 && height > 0);
SkPMColor* SK_RESTRICT dst = fDevice->getAddr32(x, y);
const SkPMColor16* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
diff --git a/src/core/SkSpriteBlitter_RGB16.cpp b/src/core/SkSpriteBlitter_RGB16.cpp
index 7707336..ca0eb50 100644
--- a/src/core/SkSpriteBlitter_RGB16.cpp
+++ b/src/core/SkSpriteBlitter_RGB16.cpp
@@ -54,7 +54,7 @@
: SkSpriteBlitter(source) {}
// overrides
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
const uint16_t* SK_RESTRICT src = fSource->getAddr16(x - fLeft,
y - fTop);
@@ -264,7 +264,7 @@
// overrides
virtual void setup(const SkBitmap& device, int left, int top,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
this->INHERITED::setup(device, left, top, paint);
unsigned flags = 0;
@@ -281,7 +281,7 @@
fProc = SkBlitRow::Factory16(flags);
}
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
uint16_t* SK_RESTRICT dst = fDevice->getAddr16(x, y);
const SkPMColor* SK_RESTRICT src = fSource->getAddr32(x - fLeft,
y - fTop);
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 65e1bee..426f556 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -680,7 +680,7 @@
: fBlockMemory(SkRef(headRef)), fCurrent(fBlockMemory->fHead)
, fSize(size) , fOffset(0), fCurrentOffset(0) { }
- size_t read(void* buffer, size_t rawCount) SK_OVERRIDE {
+ size_t read(void* buffer, size_t rawCount) override {
size_t count = rawCount;
if (fOffset + count > fSize) {
count = fSize - fOffset;
@@ -706,26 +706,26 @@
return 0;
}
- bool isAtEnd() const SK_OVERRIDE {
+ bool isAtEnd() const override {
return fOffset == fSize;
}
- bool rewind() SK_OVERRIDE {
+ bool rewind() override {
fCurrent = fBlockMemory->fHead;
fOffset = 0;
fCurrentOffset = 0;
return true;
}
- SkBlockMemoryStream* duplicate() const SK_OVERRIDE {
+ SkBlockMemoryStream* duplicate() const override {
return SkNEW_ARGS(SkBlockMemoryStream, (fBlockMemory.get(), fSize));
}
- size_t getPosition() const SK_OVERRIDE {
+ size_t getPosition() const override {
return fOffset;
}
- bool seek(size_t position) SK_OVERRIDE {
+ bool seek(size_t position) override {
// If possible, skip forward.
if (position >= fOffset) {
size_t skipAmount = position - fOffset;
@@ -742,11 +742,11 @@
return this->rewind() && this->skip(position) == position;
}
- bool move(long offset) SK_OVERRIDE {
+ bool move(long offset) override {
return seek(fOffset + offset);
}
- SkBlockMemoryStream* fork() const SK_OVERRIDE {
+ SkBlockMemoryStream* fork() const override {
SkAutoTDelete<SkBlockMemoryStream> that(this->duplicate());
that->fCurrent = this->fCurrent;
that->fOffset = this->fOffset;
@@ -754,11 +754,11 @@
return that.detach();
}
- size_t getLength() const SK_OVERRIDE {
+ size_t getLength() const override {
return fSize;
}
- const void* getMemoryBase() SK_OVERRIDE {
+ const void* getMemoryBase() override {
if (NULL == fBlockMemory->fHead->fNext) {
return fBlockMemory->fHead->start();
}
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index ad928bb..7f79c45 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -29,36 +29,36 @@
protected:
SkEmptyTypeface() : SkTypeface(SkFontStyle(), 0, true) { }
- SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; }
- SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE {
+ SkStreamAsset* onOpenStream(int* ttcIndex) const override { return NULL; }
+ SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override {
return NULL;
}
- void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { }
+ void onFilterRec(SkScalerContextRec*) const override { }
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::PerGlyphInfo,
- const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; }
- void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { }
+ const uint32_t*, uint32_t) const override { return NULL; }
+ void onGetFontDescriptor(SkFontDescriptor*, bool*) const override { }
virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
- uint16_t glyphs[], int glyphCount) const SK_OVERRIDE {
+ uint16_t glyphs[], int glyphCount) const override {
if (glyphs && glyphCount > 0) {
sk_bzero(glyphs, glyphCount * sizeof(glyphs[0]));
}
return 0;
}
- int onCountGlyphs() const SK_OVERRIDE { return 0; };
- int onGetUPEM() const SK_OVERRIDE { return 0; };
+ int onCountGlyphs() const override { return 0; };
+ int onGetUPEM() const override { return 0; };
class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings {
public:
- bool next(SkTypeface::LocalizedString*) SK_OVERRIDE { return false; }
+ bool next(SkTypeface::LocalizedString*) override { return false; }
};
- void onGetFamilyName(SkString* familyName) const SK_OVERRIDE {
+ void onGetFamilyName(SkString* familyName) const override {
familyName->reset();
}
- SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const SK_OVERRIDE {
+ SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
return SkNEW(EmptyLocalizedStrings);
};
- int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE { return 0; }
- size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const SK_OVERRIDE {
+ int onGetTableTags(SkFontTableTag tags[]) const override { return 0; }
+ size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override {
return 0;
}
};
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h
index 916bed4..bcdcba5 100644
--- a/src/core/SkValidatingReadBuffer.h
+++ b/src/core/SkValidatingReadBuffer.h
@@ -23,48 +23,48 @@
SkValidatingReadBuffer(const void* data, size_t size);
virtual ~SkValidatingReadBuffer();
- const void* skip(size_t size) SK_OVERRIDE;
+ const void* skip(size_t size) override;
// primitives
- bool readBool() SK_OVERRIDE;
- SkColor readColor() SK_OVERRIDE;
- SkFixed readFixed() SK_OVERRIDE;
- int32_t readInt() SK_OVERRIDE;
- SkScalar readScalar() SK_OVERRIDE;
- uint32_t readUInt() SK_OVERRIDE;
- int32_t read32() SK_OVERRIDE;
+ bool readBool() override;
+ SkColor readColor() override;
+ SkFixed readFixed() override;
+ int32_t readInt() override;
+ SkScalar readScalar() override;
+ uint32_t readUInt() override;
+ int32_t read32() override;
// strings -- the caller is responsible for freeing the string contents
- void readString(SkString* string) SK_OVERRIDE;
- void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE;
+ void readString(SkString* string) override;
+ void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) override;
// common data structures
- SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE;
- void skipFlattenable() SK_OVERRIDE;
- void readPoint(SkPoint* point) SK_OVERRIDE;
- void readMatrix(SkMatrix* matrix) SK_OVERRIDE;
- void readIRect(SkIRect* rect) SK_OVERRIDE;
- void readRect(SkRect* rect) SK_OVERRIDE;
- void readRegion(SkRegion* region) SK_OVERRIDE;
- void readPath(SkPath* path) SK_OVERRIDE;
+ SkFlattenable* readFlattenable(SkFlattenable::Type type) override;
+ void skipFlattenable() override;
+ void readPoint(SkPoint* point) override;
+ void readMatrix(SkMatrix* matrix) override;
+ void readIRect(SkIRect* rect) override;
+ void readRect(SkRect* rect) override;
+ void readRegion(SkRegion* region) override;
+ void readPath(SkPath* path) override;
// binary data and arrays
- bool readByteArray(void* value, size_t size) SK_OVERRIDE;
- bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE;
- bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE;
- bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE;
- bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE;
+ bool readByteArray(void* value, size_t size) override;
+ bool readColorArray(SkColor* colors, size_t size) override;
+ bool readIntArray(int32_t* values, size_t size) override;
+ bool readPointArray(SkPoint* points, size_t size) override;
+ bool readScalarArray(SkScalar* values, size_t size) override;
// helpers to get info about arrays and binary data
- uint32_t getArrayCount() SK_OVERRIDE;
+ uint32_t getArrayCount() override;
// TODO: Implement this (securely) when needed
- SkTypeface* readTypeface() SK_OVERRIDE;
+ SkTypeface* readTypeface() override;
- bool validate(bool isValid) SK_OVERRIDE;
- bool isValid() const SK_OVERRIDE;
+ bool validate(bool isValid) override;
+ bool isValid() const override;
- bool validateAvailable(size_t size) SK_OVERRIDE;
+ bool validateAvailable(size_t size) override;
private:
bool readArray(void* value, size_t size, size_t elementSize);
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 08f760d..7165e99 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1020,8 +1020,8 @@
return SkNEW_ARGS(SkClearXfermode, (rec));
}
- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
- void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;
+ void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const override;
SK_TO_STRING_OVERRIDE()
@@ -1082,8 +1082,8 @@
return SkNEW_ARGS(SkSrcXfermode, (rec));
}
- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
- void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;
+ void xferA8(SkAlpha*, const SkPMColor*, int, const SkAlpha*) const override;
SK_TO_STRING_OVERRIDE()
@@ -1148,7 +1148,7 @@
return SkNEW_ARGS(SkDstInXfermode, (rec));
}
- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;
SK_TO_STRING_OVERRIDE()
@@ -1192,7 +1192,7 @@
return SkNEW_ARGS(SkDstOutXfermode, (rec));
}
- void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const SK_OVERRIDE;
+ void xfer32(SkPMColor*, const SkPMColor*, int, const SkAlpha*) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/src/core/SkXfermode_proccoeff.h b/src/core/SkXfermode_proccoeff.h
index 8bd0811..6a3a244 100644
--- a/src/core/SkXfermode_proccoeff.h
+++ b/src/core/SkXfermode_proccoeff.h
@@ -24,30 +24,30 @@
}
virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const SK_OVERRIDE;
+ const SkAlpha aa[]) const override;
virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const SK_OVERRIDE;
+ const SkAlpha aa[]) const override;
virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count,
- const SkAlpha aa[]) const SK_OVERRIDE;
+ const SkAlpha aa[]) const override;
- bool asMode(Mode* mode) const SK_OVERRIDE;
+ bool asMode(Mode* mode) const override;
- bool supportsCoverageAsAlpha() const SK_OVERRIDE;
+ bool supportsCoverageAsAlpha() const override;
- bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const SK_OVERRIDE;
+ bool isOpaque(SkXfermode::SrcColorOpacity opacityType) const override;
#if SK_SUPPORT_GPU
virtual bool asFragmentProcessor(GrFragmentProcessor**,
- GrTexture* background) const SK_OVERRIDE;
+ GrTexture* background) const override;
- virtual bool asXPFactory(GrXPFactory**) const SK_OVERRIDE;
+ virtual bool asXPFactory(GrXPFactory**) const override;
#endif
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcCoeffXfermode)
protected:
- void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer& buffer) const override;
Mode getMode() const { return fMode; }
diff --git a/src/core/SkYUVPlanesCache.cpp b/src/core/SkYUVPlanesCache.cpp
index 5ef89b6..79136db 100644
--- a/src/core/SkYUVPlanesCache.cpp
+++ b/src/core/SkYUVPlanesCache.cpp
@@ -46,8 +46,8 @@
YUVPlanesKey fKey;
YUVValue fValue;
- const Key& getKey() const SK_OVERRIDE { return fKey; }
- size_t bytesUsed() const SK_OVERRIDE { return sizeof(*this) + fValue.fData->size(); }
+ const Key& getKey() const override { return fKey; }
+ size_t bytesUsed() const override { return sizeof(*this) + fValue.fData->size(); }
static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
const YUVPlanesRec& rec = static_cast<const YUVPlanesRec&>(baseRec);