Index: src/svg/SkSVGDevice.h |
diff --git a/src/svg/SkSVGDevice.h b/src/svg/SkSVGDevice.h |
index 914642392fa62b0e2e845c483b8932b1bab1a697..d6b56e87c3a9aa302d2b87e022d017c316e93320 100644 |
--- a/src/svg/SkSVGDevice.h |
+++ b/src/svg/SkSVGDevice.h |
@@ -16,46 +16,46 @@ class SkSVGDevice : public SkBaseDevice { |
public: |
static SkBaseDevice* Create(const SkISize& size, SkXMLWriter* writer); |
- virtual SkImageInfo imageInfo() const SK_OVERRIDE; |
+ virtual SkImageInfo imageInfo() const override; |
protected: |
- virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; |
+ virtual void drawPaint(const SkDraw&, const SkPaint& paint) override; |
virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, |
- const SkPoint[], const SkPaint& paint) SK_OVERRIDE; |
- virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) SK_OVERRIDE; |
- virtual void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) SK_OVERRIDE; |
- virtual void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) SK_OVERRIDE; |
+ const SkPoint[], const SkPaint& paint) override; |
+ virtual void drawRect(const SkDraw&, const SkRect& r, const SkPaint& paint) override; |
+ virtual void drawOval(const SkDraw&, const SkRect& oval, const SkPaint& paint) override; |
+ virtual void drawRRect(const SkDraw&, const SkRRect& rr, const SkPaint& paint) override; |
virtual void drawPath(const SkDraw&, const SkPath& path, |
const SkPaint& paint, |
const SkMatrix* prePathMatrix = NULL, |
- bool pathIsMutable = false) SK_OVERRIDE; |
+ bool pathIsMutable = false) override; |
virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, |
- const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE; |
+ const SkMatrix& matrix, const SkPaint& paint) override; |
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; |
virtual void drawBitmapRect(const SkDraw&, const SkBitmap&, |
const SkRect* srcOrNull, const SkRect& dst, |
const SkPaint& paint, |
- SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE; |
+ SkCanvas::DrawBitmapRectFlags flags) override; |
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; |
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; |
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; |
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; |
+ const SkPaint& paint) override; |
virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, |
- const SkPaint&) SK_OVERRIDE; |
- virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE; |
+ const SkPaint&) override; |
+ virtual const SkBitmap& onAccessBitmap() override; |
private: |
SkSVGDevice(const SkISize& size, SkXMLWriter* writer); |