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/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h
index 27bc6bc..6602110 100644
--- a/src/utils/SkCanvasStack.h
+++ b/src/utils/SkCanvasStack.h
@@ -18,7 +18,7 @@
virtual ~SkCanvasStack();
void pushCanvas(SkCanvas* canvas, const SkIPoint& origin);
- void removeAll() SK_OVERRIDE;
+ void removeAll() override;
/*
* The following add/remove canvas methods are overrides from SkNWayCanvas
@@ -26,16 +26,16 @@
* can share most of the other implementation of NWay we override those
* methods to be no-ops.
*/
- void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
- void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); }
+ void addCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); }
+ void removeCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); }
protected:
- void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
+ void didSetMatrix(const SkMatrix&) 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;
private:
void clipToZOrderedBounds();
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index 0a14802..f7a9447 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -141,15 +141,15 @@
bool failed() { return fFailed; }
// ClipVisitor
- void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) SK_OVERRIDE {
+ void clipRect(const SkRect& rect, SkRegion::Op op, bool antialias) override {
fFailed |= antialias;
}
- void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) SK_OVERRIDE {
+ void clipRRect(const SkRRect& rrect, SkRegion::Op op, bool antialias) override {
fFailed |= antialias;
}
- void clipPath(const SkPath&, SkRegion::Op, bool antialias) SK_OVERRIDE {
+ void clipPath(const SkPath&, SkRegion::Op, bool antialias) override {
fFailed |= antialias;
}
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index 5b3b58c..d248823 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -65,8 +65,8 @@
DeferredPipeController();
void setPlaybackCanvas(SkCanvas*);
virtual ~DeferredPipeController();
- void* requestBlock(size_t minRequest, size_t* actual) SK_OVERRIDE;
- void notifyWritten(size_t bytes) SK_OVERRIDE;
+ void* requestBlock(size_t minRequest, size_t* actual) override;
+ void notifyWritten(size_t bytes) override;
void playback(bool silent);
bool hasPendingCommands() const { return fAllocator.totalUsed() != 0; }
size_t storageAllocatedForRecording() const { return fAllocator.totalCapacity(); }
@@ -158,90 +158,90 @@
void recordedDrawCommand();
void setIsDrawingToLayer(bool value) {fIsDrawingToLayer = value;}
- SkImageInfo imageInfo() const SK_OVERRIDE;
+ SkImageInfo imageInfo() const override;
- GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
+ GrRenderTarget* accessRenderTarget() override;
- SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE;
+ SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
- SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
+ SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
protected:
- const SkBitmap& onAccessBitmap() SK_OVERRIDE;
- bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE;
- bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) SK_OVERRIDE;
+ const SkBitmap& onAccessBitmap() override;
+ bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) override;
+ bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) override;
// None of the following drawing methods should ever get called on the
// deferred device
- void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE
+ void drawPaint(const SkDraw&, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode,
size_t count, const SkPoint[],
- const SkPaint& paint) SK_OVERRIDE
+ const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawRect(const SkDraw&, const SkRect& r,
- const SkPaint& paint) SK_OVERRIDE
+ const SkPaint& paint) override
{SkASSERT(0);}
- void drawOval(const SkDraw&, const SkRect&, const SkPaint&) SK_OVERRIDE
+ void drawOval(const SkDraw&, const SkRect&, const SkPaint&) override
{SkASSERT(0);}
virtual void drawRRect(const SkDraw&, const SkRRect& rr,
- const SkPaint& paint) SK_OVERRIDE
+ const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawPath(const SkDraw&, const SkPath& path,
const SkPaint& paint,
const SkMatrix* prePathMatrix = NULL,
- bool pathIsMutable = false) SK_OVERRIDE
+ bool pathIsMutable = false) override
{SkASSERT(0);}
virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
- const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE
+ const SkMatrix& matrix, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*,
const SkRect&, const SkPaint&,
- SkCanvas::DrawBitmapRectFlags) SK_OVERRIDE
+ SkCanvas::DrawBitmapRectFlags) override
{SkASSERT(0);}
virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap,
- int x, int y, const SkPaint& paint) SK_OVERRIDE
+ int x, int y, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawText(const SkDraw&, const void* text, size_t len,
- SkScalar x, SkScalar y, const SkPaint& paint) SK_OVERRIDE
+ SkScalar x, SkScalar y, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawPosText(const SkDraw&, const void* text, size_t len,
const SkScalar pos[], int scalarsPerPos,
- const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE
+ const SkPoint& offset, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawTextOnPath(const SkDraw&, const void* text,
size_t len, const SkPath& path,
const SkMatrix* matrix,
- const SkPaint& paint) SK_OVERRIDE
+ const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode,
int vertexCount, const SkPoint verts[],
const SkPoint texs[], const SkColor colors[],
SkXfermode* xmode, const uint16_t indices[],
- int indexCount, const SkPaint& paint) SK_OVERRIDE
+ int indexCount, const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawPatch(const SkDraw&, const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkXfermode* xmode,
- const SkPaint& paint) SK_OVERRIDE
+ const SkPaint& paint) override
{SkASSERT(0);}
virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y,
- const SkPaint&) SK_OVERRIDE
+ const SkPaint&) override
{SkASSERT(0);}
- void lockPixels() SK_OVERRIDE {}
- void unlockPixels() SK_OVERRIDE {}
+ void lockPixels() override {}
+ void unlockPixels() override {}
- bool canHandleImageFilter(const SkImageFilter*) SK_OVERRIDE {
+ bool canHandleImageFilter(const SkImageFilter*) override {
return false;
}
virtual bool filterImage(const SkImageFilter*, const SkBitmap&,
- const SkImageFilter::Context&, SkBitmap*, SkIPoint*) SK_OVERRIDE {
+ const SkImageFilter::Context&, SkBitmap*, SkIPoint*) override {
return false;
}
private:
- void flush() SK_OVERRIDE;
- void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {}
+ void flush() override;
+ void replaceBitmapBackendForRasterSurface(const SkBitmap&) override {}
void beginRecording();
void init();
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp
index ef2a055..bbd8c3d 100644
--- a/src/utils/SkEventTracer.cpp
+++ b/src/utils/SkEventTracer.cpp
@@ -18,19 +18,19 @@
const char** argNames,
const uint8_t* argTypes,
const uint64_t* argValues,
- uint8_t flags) SK_OVERRIDE { return 0; }
+ uint8_t flags) override { return 0; }
virtual void
updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
const char* name,
- SkEventTracer::Handle handle) SK_OVERRIDE {};
+ SkEventTracer::Handle handle) override {};
- const uint8_t* getCategoryGroupEnabled(const char* name) SK_OVERRIDE {
+ const uint8_t* getCategoryGroupEnabled(const char* name) override {
static uint8_t no = 0;
return &no;
};
virtual const char* getCategoryGroupName(
- const uint8_t* categoryEnabledFlag) SK_OVERRIDE {
+ const uint8_t* categoryEnabledFlag) override {
static const char* dummy = "dummy";
return dummy;
};
diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp
index 562d376..f23b1f9 100644
--- a/src/utils/SkFrontBufferedStream.cpp
+++ b/src/utils/SkFrontBufferedStream.cpp
@@ -14,21 +14,21 @@
// Called by Create.
FrontBufferedStream(SkStream*, size_t bufferSize);
- size_t read(void* buffer, size_t size) SK_OVERRIDE;
+ size_t read(void* buffer, size_t size) override;
- bool isAtEnd() const SK_OVERRIDE;
+ bool isAtEnd() const override;
- bool rewind() SK_OVERRIDE;
+ bool rewind() override;
- bool hasPosition() const SK_OVERRIDE { return true; }
+ bool hasPosition() const override { return true; }
- size_t getPosition() const SK_OVERRIDE { return fOffset; }
+ size_t getPosition() const override { return fOffset; }
- bool hasLength() const SK_OVERRIDE { return fHasLength; }
+ bool hasLength() const override { return fHasLength; }
- size_t getLength() const SK_OVERRIDE { return fLength; }
+ size_t getLength() const override { return fLength; }
- SkStreamRewindable* duplicate() const SK_OVERRIDE { return NULL; }
+ SkStreamRewindable* duplicate() const override { return NULL; }
private:
SkAutoTDelete<SkStream> fStream;
diff --git a/src/utils/SkMD5.h b/src/utils/SkMD5.h
index 889338b..1834a1b 100644
--- a/src/utils/SkMD5.h
+++ b/src/utils/SkMD5.h
@@ -24,12 +24,12 @@
/** Processes input, adding it to the digest.
* Note that this treats the buffer as a series of uint8_t values.
*/
- bool write(const void* buffer, size_t size) SK_OVERRIDE {
+ bool write(const void* buffer, size_t size) override {
this->update(reinterpret_cast<const uint8_t*>(buffer), size);
return true;
}
- size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); }
+ size_t bytesWritten() const override { return SkToSizeT(this->byteCount); }
/** Processes input, adding it to the digest. Calling this after finish is undefined. */
void update(const uint8_t* input, size_t length);
diff --git a/src/utils/SkSHA1.h b/src/utils/SkSHA1.h
index e7ede64..aa0867f 100644
--- a/src/utils/SkSHA1.h
+++ b/src/utils/SkSHA1.h
@@ -24,12 +24,12 @@
/** Processes input, adding it to the digest.
* Note that this treats the buffer as a series of uint8_t values.
*/
- bool write(const void* buffer, size_t size) SK_OVERRIDE {
+ bool write(const void* buffer, size_t size) override {
update(reinterpret_cast<const uint8_t*>(buffer), size);
return true;
}
- size_t bytesWritten() const SK_OVERRIDE { return SkToSizeT(this->byteCount); }
+ size_t bytesWritten() const override { return SkToSizeT(this->byteCount); }
/** Processes input, adding it to the digest. Calling this after finish is undefined. */
void update(const uint8_t* input, size_t length);
diff --git a/src/utils/SkTextBox.cpp b/src/utils/SkTextBox.cpp
index 0bb7a6b..05b3b49 100644
--- a/src/utils/SkTextBox.cpp
+++ b/src/utils/SkTextBox.cpp
@@ -246,7 +246,7 @@
CanvasVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
virtual void operator()(const char text[], size_t length, SkScalar x, SkScalar y,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
fCanvas->drawText(text, length, x, y, paint);
}
};
@@ -284,7 +284,7 @@
SkTextBlobBuilder fBuilder;
virtual void operator()(const char text[], size_t length, SkScalar x, SkScalar y,
- const SkPaint& paint) SK_OVERRIDE {
+ const SkPaint& paint) override {
SkPaint p(paint);
p.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
const int count = paint.countText(text, length);
diff --git a/src/utils/SkTextureCompressor_Blitter.h b/src/utils/SkTextureCompressor_Blitter.h
index 186df53..613b3d9 100644
--- a/src/utils/SkTextureCompressor_Blitter.h
+++ b/src/utils/SkTextureCompressor_Blitter.h
@@ -85,7 +85,7 @@
virtual ~SkTCompressedAlphaBlitter() { this->flushRuns(); }
// Blit a horizontal run of one or more pixels.
- void blitH(int x, int y, int width) SK_OVERRIDE {
+ void blitH(int x, int y, int width) override {
// This function is intended to be called from any standard RGB
// buffer, so we should never encounter it. However, if some code
// path does end up here, then this needs to be investigated.
@@ -96,7 +96,7 @@
// zero-terminated run-length encoding of spans of constant alpha values.
virtual void blitAntiH(int x, int y,
const SkAlpha antialias[],
- const int16_t runs[]) SK_OVERRIDE {
+ const int16_t runs[]) override {
SkASSERT(0 == x);
// Make sure that the new row to blit is either the first
@@ -141,7 +141,7 @@
}
// Blit a vertical run of pixels with a constant alpha value.
- void blitV(int x, int y, int height, SkAlpha alpha) SK_OVERRIDE {
+ void blitV(int x, int y, int height, SkAlpha alpha) override {
// This function is currently not implemented. It is not explicitly
// required by the contract, but if at some time a code path runs into
// this function (which is entirely possible), it needs to be implemented.
@@ -163,7 +163,7 @@
#ifdef SK_DEBUG
bool fCalledOnceWithNonzeroY;
#endif
- void blitRect(int x, int y, int width, int height) SK_OVERRIDE {
+ void blitRect(int x, int y, int width, int height) override {
// Assumptions:
SkASSERT(0 == x);
@@ -279,7 +279,7 @@
// width (zero or more) opaque pixels, and one alpha-blended column
// on the right. The result will always be at least two pixels wide.
virtual void blitAntiRect(int x, int y, int width, int height,
- SkAlpha leftAlpha, SkAlpha rightAlpha) SK_OVERRIDE {
+ SkAlpha leftAlpha, SkAlpha rightAlpha) override {
// This function is currently not implemented. It is not explicitly
// required by the contract, but if at some time a code path runs into
// this function (which is entirely possible), it needs to be implemented.
@@ -306,7 +306,7 @@
#ifdef SK_DEBUG
bool fBlitMaskCalled;
#endif
- void blitMask(const SkMask& mask, const SkIRect& clip) SK_OVERRIDE {
+ void blitMask(const SkMask& mask, const SkIRect& clip) override {
// Assumptions:
SkASSERT(!fBlitMaskCalled);
@@ -368,7 +368,7 @@
// If the blitter just sets a single value for each pixel, return the
// bitmap it draws into, and assign value. If not, return NULL and ignore
// the value parameter.
- const SkBitmap* justAnOpaqueColor(uint32_t* value) SK_OVERRIDE {
+ const SkBitmap* justAnOpaqueColor(uint32_t* value) override {
return NULL;
}
@@ -378,7 +378,7 @@
* to preserve semantics if blitAntiH doesn't get called in too many
* weird ways...
*/
- int requestRowsPreserved() const SK_OVERRIDE { return BlockDim; }
+ int requestRowsPreserved() const override { return BlockDim; }
private:
static const int kPixelsPerBlock = BlockDim * BlockDim;
diff --git a/src/utils/android/SkAndroidSDKCanvas.h b/src/utils/android/SkAndroidSDKCanvas.h
index fc04618..dc79be2 100644
--- a/src/utils/android/SkAndroidSDKCanvas.h
+++ b/src/utils/android/SkAndroidSDKCanvas.h
@@ -33,70 +33,70 @@
// FILTERING
- void onDrawPaint(const SkPaint& paint) SK_OVERRIDE;
+ void onDrawPaint(const SkPaint& paint) override;
void onDrawPoints(PointMode pMode, size_t count, const SkPoint pts[],
- const SkPaint& paint) SK_OVERRIDE;
- void onDrawOval(const SkRect& r, const SkPaint& paint) SK_OVERRIDE;
- void onDrawRect(const SkRect& r, const SkPaint& paint) SK_OVERRIDE;
- void onDrawRRect(const SkRRect& r, const SkPaint& paint) SK_OVERRIDE;
- void onDrawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
+ void onDrawOval(const SkRect& r, const SkPaint& paint) override;
+ void onDrawRect(const SkRect& r, const SkPaint& paint) override;
+ void onDrawRRect(const SkRRect& r, const SkPaint& paint) override;
+ void onDrawPath(const SkPath& path, const SkPaint& paint) override;
void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
- const SkPaint* paint) SK_OVERRIDE;
+ const SkPaint* paint) override;
void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
- const SkPaint* paint, DrawBitmapRectFlags flags) SK_OVERRIDE;
+ const SkPaint* paint, DrawBitmapRectFlags flags) override;
void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
- const SkRect& dst, const SkPaint* paint) SK_OVERRIDE;
+ const SkRect& dst, const SkPaint* paint) override;
void onDrawSprite(const SkBitmap& bitmap, int left, int top,
- const SkPaint* paint) SK_OVERRIDE;
+ const SkPaint* paint) 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& paint) SK_OVERRIDE;
+ const SkPaint& paint) override;
void onDrawDRRect(const SkRRect& outer, const SkRRect& inner,
- const SkPaint& paint) SK_OVERRIDE;
+ const SkPaint& paint) 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;
+ SkScalar constY, const SkPaint& paint) override;
void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint& paint) SK_OVERRIDE;
+ const SkMatrix* matrix, 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 onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) SK_OVERRIDE;
+ void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override;
void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*)
- SK_OVERRIDE;
+ override;
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*);
// PASS THROUGH
- void onDrawDrawable(SkDrawable*) SK_OVERRIDE;
- SkISize getBaseLayerSize() const SK_OVERRIDE;
- bool getClipBounds(SkRect*) const SK_OVERRIDE;
- bool getClipDeviceBounds(SkIRect*) const SK_OVERRIDE;
- bool isClipEmpty() const SK_OVERRIDE;
- bool isClipRect() const SK_OVERRIDE;
- SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
- const void* onPeekPixels(SkImageInfo*, size_t*) SK_OVERRIDE;
- void* onAccessTopLayerPixels(SkImageInfo*, size_t*) SK_OVERRIDE;
- void willSave() SK_OVERRIDE;
- void willRestore() SK_OVERRIDE;
- void didRestore() SK_OVERRIDE;
- void didConcat(const SkMatrix&) SK_OVERRIDE;
- void didSetMatrix(const SkMatrix&) SK_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 onDiscard() SK_OVERRIDE;
+ void onDrawDrawable(SkDrawable*) override;
+ SkISize getBaseLayerSize() const override;
+ bool getClipBounds(SkRect*) const override;
+ bool getClipDeviceBounds(SkIRect*) const override;
+ bool isClipEmpty() const override;
+ bool isClipRect() const override;
+ SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+ const void* onPeekPixels(SkImageInfo*, size_t*) override;
+ void* onAccessTopLayerPixels(SkImageInfo*, size_t*) override;
+ void willSave() override;
+ void willRestore() override;
+ void didRestore() override;
+ void didConcat(const SkMatrix&) override;
+ void didSetMatrix(const SkMatrix&) 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 onDiscard() override;
protected:
SkCanvas* fProxyTarget;
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 779d695..6d186a7 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -90,7 +90,7 @@
class OverdrawXfermode : public SkXfermode {
public:
- SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE {
+ SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override {
// This table encodes the color progression of the overdraw visualization
static const SkPMColor gTable[] = {
SkPackARGB32(0x00, 0x00, 0x00, 0x00),
@@ -123,9 +123,9 @@
return gTable[idx];
}
- Factory getFactory() const SK_OVERRIDE { return NULL; }
+ Factory getFactory() const override { return NULL; }
#ifndef SK_IGNORE_TO_STRING
- virtual void toString(SkString* str) const SK_OVERRIDE { str->set("OverdrawXfermode"); }
+ virtual void toString(SkString* str) const override { str->set("OverdrawXfermode"); }
#endif
};
@@ -139,7 +139,7 @@
delete fXferMode;
}
- bool filter(SkPaint* p, Type) SK_OVERRIDE {
+ bool filter(SkPaint* p, Type) override {
p->setXfermode(fXferMode);
p->setAntiAlias(false);
return true;
@@ -163,7 +163,7 @@
fFilterQuality = filterQuality;
}
- bool filter(SkPaint* p, Type) SK_OVERRIDE {
+ bool filter(SkPaint* p, Type) override {
p->setFilterQuality(fFilterQuality);
return true;
}
@@ -179,21 +179,21 @@
public:
SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {}
- void clipRect(const SkRect& r, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipRect(const SkRect& r, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorRED);
p.setStyle(SkPaint::kStroke_Style);
p.setAntiAlias(doAA);
fCanvas->drawRect(r, p);
}
- void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipRRect(const SkRRect& rr, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorGREEN);
p.setStyle(SkPaint::kStroke_Style);
p.setAntiAlias(doAA);
fCanvas->drawRRect(rr, p);
}
- void clipPath(const SkPath& path, SkRegion::Op, bool doAA) SK_OVERRIDE {
+ void clipPath(const SkPath& path, SkRegion::Op, bool doAA) override {
SkPaint p;
p.setColor(SK_ColorBLUE);
p.setStyle(SkPaint::kStroke_Style);
diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
index 5771dd9..66b85fc 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -142,16 +142,16 @@
// Inherited from SkCanvas
////////////////////////////////////////////////////////////////////////////////
- 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;
static const int kVizImageHeight = 256;
static const int kVizImageWidth = 256;
- bool isClipEmpty() const SK_OVERRIDE { return false; }
- bool isClipRect() const SK_OVERRIDE { return true; }
- bool getClipBounds(SkRect* bounds) const SK_OVERRIDE {
+ bool isClipEmpty() const override { return false; }
+ bool isClipRect() const override { return true; }
+ bool getClipBounds(SkRect* bounds) const override {
if (bounds) {
bounds->setXYWH(0, 0,
SkIntToScalar(this->imageInfo().width()),
@@ -159,7 +159,7 @@
}
return true;
}
- bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE {
+ bool getClipDeviceBounds(SkIRect* bounds) const override {
if (bounds) {
bounds->setLargest();
}
@@ -167,54 +167,54 @@
}
protected:
- 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;
void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
- const SkPaint&) SK_OVERRIDE;
+ const SkPaint&) override;
void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
- SkScalar constY, const SkPaint&) SK_OVERRIDE;
+ SkScalar constY, const SkPaint&) override;
void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
- const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
+ const SkMatrix* matrix, const SkPaint&) 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);
- void onDrawPaint(const SkPaint&) SK_OVERRIDE;
+ void onDrawPaint(const SkPaint&) 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 onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE;
+ void onDrawRect(const SkRect&, const SkPaint&) override;
+ void onDrawOval(const SkRect&, const SkPaint&) override;
+ void onDrawRRect(const SkRRect&, const SkPaint&) override;
+ void onDrawPoints(PointMode, size_t count, const SkPoint pts[], 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;
- void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE;
- void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE;
+ 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;
- 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& region, SkRegion::Op) SK_OVERRIDE;
+ const SkPaint*) override;
+ void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) 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& region, SkRegion::Op) override;
- void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE;
+ void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
void markActiveCommands(int index);
diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
index bcc97ca..9e25f4d 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -113,8 +113,8 @@
class SkRestoreCommand : public SkDrawCommand {
public:
SkRestoreCommand();
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- Action action() const SK_OVERRIDE { return kPopLayer_Action; }
+ void execute(SkCanvas* canvas) const override;
+ Action action() const override { return kPopLayer_Action; }
private:
typedef SkDrawCommand INHERITED;
@@ -123,7 +123,7 @@
class SkClearCommand : public SkDrawCommand {
public:
SkClearCommand(SkColor color);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkColor fColor;
@@ -133,8 +133,8 @@
class SkClipPathCommand : public SkDrawCommand {
public:
SkClipPathCommand(const SkPath& path, SkRegion::Op op, bool doAA);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkPath fPath;
SkRegion::Op fOp;
@@ -146,7 +146,7 @@
class SkClipRegionCommand : public SkDrawCommand {
public:
SkClipRegionCommand(const SkRegion& region, SkRegion::Op op);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkRegion fRegion;
SkRegion::Op fOp;
@@ -157,7 +157,7 @@
class SkClipRectCommand : public SkDrawCommand {
public:
SkClipRectCommand(const SkRect& rect, SkRegion::Op op, bool doAA);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
const SkRect& rect() const { return fRect; }
SkRegion::Op op() const { return fOp; }
@@ -174,8 +174,8 @@
class SkClipRRectCommand : public SkDrawCommand {
public:
SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
const SkRRect& rrect() const { return fRRect; }
SkRegion::Op op() const { return fOp; }
@@ -192,7 +192,7 @@
class SkConcatCommand : public SkDrawCommand {
public:
SkConcatCommand(const SkMatrix& matrix);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkMatrix fMatrix;
@@ -203,8 +203,8 @@
public:
SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
const SkPaint* paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkBitmap fBitmap;
SkScalar fLeft;
@@ -219,8 +219,8 @@
public:
SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkBitmap fBitmap;
SkIRect fCenter;
@@ -236,8 +236,8 @@
SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst, const SkPaint* paint,
SkCanvas::DrawBitmapRectFlags flags);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
const SkBitmap& bitmap() const { return fBitmap; }
@@ -273,7 +273,7 @@
class SkBeginCommentGroupCommand : public SkDrawCommand {
public:
SkBeginCommentGroupCommand(const char* description);
- void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ void execute(SkCanvas* canvas) const override {
canvas->beginCommentGroup(fDescription.c_str());
};
private:
@@ -285,7 +285,7 @@
class SkCommentCommand : public SkDrawCommand {
public:
SkCommentCommand(const char* kywd, const char* value);
- void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ void execute(SkCanvas* canvas) const override {
canvas->addComment(fKywd.c_str(), fValue.c_str());
};
private:
@@ -298,7 +298,7 @@
class SkEndCommentGroupCommand : public SkDrawCommand {
public:
SkEndCommentGroupCommand();
- void execute(SkCanvas* canvas) const SK_OVERRIDE {
+ void execute(SkCanvas* canvas) const override {
canvas->endCommentGroup();
};
private:
@@ -308,8 +308,8 @@
class SkDrawOvalCommand : public SkDrawCommand {
public:
SkDrawOvalCommand(const SkRect& oval, const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkRect fOval;
SkPaint fPaint;
@@ -320,8 +320,8 @@
class SkDrawPaintCommand : public SkDrawCommand {
public:
SkDrawPaintCommand(const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkPaint fPaint;
@@ -331,8 +331,8 @@
class SkDrawPathCommand : public SkDrawCommand {
public:
SkDrawPathCommand(const SkPath& path, const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkPath fPath;
@@ -344,8 +344,8 @@
class SkDrawPictureCommand : public SkDrawCommand {
public:
SkDrawPictureCommand(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkAutoTUnref<const SkPicture> fPicture;
@@ -362,8 +362,8 @@
SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, const SkPoint pts[],
const SkPaint& paint);
virtual ~SkDrawPointsCommand() { delete [] fPts; }
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkCanvas::PointMode fMode;
size_t fCount;
@@ -378,7 +378,7 @@
SkDrawTextCommand(const void* text, size_t byteLength, SkScalar x, SkScalar y,
const SkPaint& paint);
virtual ~SkDrawTextCommand() { delete [] fText; }
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
char* fText;
size_t fByteLength;
@@ -394,7 +394,7 @@
SkDrawPosTextCommand(const void* text, size_t byteLength, const SkPoint pos[],
const SkPaint& paint);
virtual ~SkDrawPosTextCommand() { delete [] fPos; delete [] fText; }
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
char* fText;
size_t fByteLength;
@@ -409,7 +409,7 @@
SkDrawTextOnPathCommand(const void* text, size_t byteLength, const SkPath& path,
const SkMatrix* matrix, const SkPaint& paint);
virtual ~SkDrawTextOnPathCommand() { delete [] fText; }
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
char* fText;
size_t fByteLength;
@@ -425,7 +425,7 @@
SkDrawPosTextHCommand(const void* text, size_t byteLength, const SkScalar xpos[],
SkScalar constY, const SkPaint& paint);
virtual ~SkDrawPosTextHCommand() { delete [] fXpos; delete [] fText; }
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkScalar* fXpos;
char* fText;
@@ -440,8 +440,8 @@
public:
SkDrawTextBlobCommand(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkAutoTUnref<const SkTextBlob> fBlob;
@@ -457,7 +457,7 @@
SkDrawPatchCommand(const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkXfermode* xmode,
const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkPoint fCubics[12];
@@ -473,7 +473,7 @@
class SkDrawRectCommand : public SkDrawCommand {
public:
SkDrawRectCommand(const SkRect& rect, const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
const SkRect& rect() const { return fRect; }
const SkPaint& paint() const { return fPaint; }
@@ -487,8 +487,8 @@
class SkDrawRRectCommand : public SkDrawCommand {
public:
SkDrawRRectCommand(const SkRRect& rrect, const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkRRect fRRect;
SkPaint fPaint;
@@ -500,8 +500,8 @@
public:
SkDrawDRRectCommand(const SkRRect& outer, const SkRRect& inner,
const SkPaint& paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkRRect fOuter;
SkRRect fInner;
@@ -513,8 +513,8 @@
class SkDrawSpriteCommand : public SkDrawCommand {
public:
SkDrawSpriteCommand(const SkBitmap& bitmap, int left, int top, const SkPaint* paint);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- bool render(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
+ bool render(SkCanvas* canvas) const override;
private:
SkBitmap fBitmap;
int fLeft;
@@ -533,7 +533,7 @@
const uint16_t indices[], int indexCount,
const SkPaint& paint);
virtual ~SkDrawVerticesCommand();
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void execute(SkCanvas* canvas) const override;
private:
SkCanvas::VertexMode fVmode;
int fVertexCount;
@@ -551,8 +551,8 @@
class SkSaveCommand : public SkDrawCommand {
public:
SkSaveCommand();
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- Action action() const SK_OVERRIDE { return kPushLayer_Action; }
+ void execute(SkCanvas* canvas) const override;
+ Action action() const override { return kPushLayer_Action; }
private:
typedef SkDrawCommand INHERITED;
};
@@ -561,11 +561,11 @@
public:
SkSaveLayerCommand(const SkRect* bounds, const SkPaint* paint,
SkCanvas::SaveFlags flags);
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
- void vizExecute(SkCanvas* canvas) const SK_OVERRIDE;
- Action action() const SK_OVERRIDE{ return kPushLayer_Action; }
- void setActive(bool active) SK_OVERRIDE { fActive = active; }
- bool active() const SK_OVERRIDE { return fActive; }
+ void execute(SkCanvas* canvas) const override;
+ void vizExecute(SkCanvas* canvas) const override;
+ Action action() const override{ return kPushLayer_Action; }
+ void setActive(bool active) override { fActive = active; }
+ bool active() const override { return fActive; }
const SkPaint* paint() const { return fPaintPtr; }
@@ -583,8 +583,8 @@
class SkSetMatrixCommand : public SkDrawCommand {
public:
SkSetMatrixCommand(const SkMatrix& matrix);
- void setUserMatrix(const SkMatrix&) SK_OVERRIDE;
- void execute(SkCanvas* canvas) const SK_OVERRIDE;
+ void setUserMatrix(const SkMatrix&) override;
+ void execute(SkCanvas* canvas) const override;
private:
SkMatrix fUserMatrix;
SkMatrix fMatrix;
diff --git a/src/utils/win/SkDWriteFontFileStream.h b/src/utils/win/SkDWriteFontFileStream.h
index ba16f70..e78b621 100644
--- a/src/utils/win/SkDWriteFontFileStream.h
+++ b/src/utils/win/SkDWriteFontFileStream.h
@@ -25,16 +25,16 @@
explicit SkDWriteFontFileStream(IDWriteFontFileStream* fontFileStream);
virtual ~SkDWriteFontFileStream();
- size_t read(void* buffer, size_t size) SK_OVERRIDE;
- bool isAtEnd() const SK_OVERRIDE;
- bool rewind() SK_OVERRIDE;
- SkDWriteFontFileStream* duplicate() const SK_OVERRIDE;
- size_t getPosition() const SK_OVERRIDE;
- bool seek(size_t position) SK_OVERRIDE;
- bool move(long offset) SK_OVERRIDE;
- SkDWriteFontFileStream* fork() const SK_OVERRIDE;
- size_t getLength() const SK_OVERRIDE;
- const void* getMemoryBase() SK_OVERRIDE;
+ size_t read(void* buffer, size_t size) override;
+ bool isAtEnd() const override;
+ bool rewind() override;
+ SkDWriteFontFileStream* duplicate() const override;
+ size_t getPosition() const override;
+ bool seek(size_t position) override;
+ bool move(long offset) override;
+ SkDWriteFontFileStream* fork() const override;
+ size_t getLength() const override;
+ const void* getMemoryBase() override;
private:
SkTScopedComPtr<IDWriteFontFileStream> fFontFileStream;
diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
index 703ac3d..417c7f0 100644
--- a/src/utils/win/SkDWriteGeometrySink.h
+++ b/src/utils/win/SkDWriteGeometrySink.h
@@ -28,17 +28,17 @@
virtual ~SkDWriteGeometrySink();
public:
- HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) SK_OVERRIDE;
- ULONG STDMETHODCALLTYPE AddRef(void) SK_OVERRIDE;
- ULONG STDMETHODCALLTYPE Release(void) SK_OVERRIDE;
+ HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void **object) override;
+ ULONG STDMETHODCALLTYPE AddRef(void) override;
+ ULONG STDMETHODCALLTYPE Release(void) override;
- void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) SK_OVERRIDE;
- void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) SK_OVERRIDE;
- void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) SK_OVERRIDE;
- void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) SK_OVERRIDE;
- void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) SK_OVERRIDE;
- void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) SK_OVERRIDE;
- HRESULT STDMETHODCALLTYPE Close() SK_OVERRIDE;
+ void STDMETHODCALLTYPE SetFillMode(D2D1_FILL_MODE fillMode) override;
+ void STDMETHODCALLTYPE SetSegmentFlags(D2D1_PATH_SEGMENT vertexFlags) override;
+ void STDMETHODCALLTYPE BeginFigure(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) override;
+ void STDMETHODCALLTYPE AddLines(const D2D1_POINT_2F *points, UINT pointsCount) override;
+ void STDMETHODCALLTYPE AddBeziers(const D2D1_BEZIER_SEGMENT *beziers, UINT beziersCount) override;
+ void STDMETHODCALLTYPE EndFigure(D2D1_FIGURE_END figureEnd) override;
+ HRESULT STDMETHODCALLTYPE Close() override;
static HRESULT Create(SkPath* path, IDWriteGeometrySink** geometryToPath);
};