diff options
Diffstat (limited to 'experimental/PdfViewer/SkNulCanvas.h')
| -rw-r--r-- | experimental/PdfViewer/SkNulCanvas.h | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 58c239a053..c8a95e9e95 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -26,13 +26,13 @@ public: explicit SkNulCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap) {} virtual ~SkNulCanvas() {} - void beginCommentGroup(const char* description) SK_OVERRIDE {} - void addComment(const char* kywd, const char* value) SK_OVERRIDE {} - void endCommentGroup() SK_OVERRIDE {} - SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;} + void beginCommentGroup(const char* description) override {} + void addComment(const char* kywd, const char* value) override {} + void endCommentGroup() override {} + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) override {return NULL;} - bool isClipEmpty() const SK_OVERRIDE { return false; } - bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { + bool isClipEmpty() const override { return false; } + bool getClipBounds(SkRect* bounds) const override { if (NULL != bounds) { bounds->setXYWH(0, 0, SkIntToScalar(this->imageInfo().width()), @@ -40,7 +40,7 @@ public: } return true; } - bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE { + bool getClipDeviceBounds(SkIRect* bounds) const override { if (NULL != bounds) { bounds->setLargest(); } @@ -52,54 +52,54 @@ protected: virtual SkBaseDevice* setDevice(SkBaseDevice* device) {return NULL;} virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint, - SaveFlags flags) SK_OVERRIDE { + SaveFlags flags) override { this->INHERITED::willSaveLayer(bounds, paint, flags); return kNoLayer_SaveLayerStrategy; } virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, - SkScalar y, const SkPaint& paint) SK_OVERRIDE {} + SkScalar y, const SkPaint& paint) override {} virtual void onDrawPosText(const void* text, size_t byteLength, - const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE {} + const SkPoint pos[], const SkPaint& paint) override {} virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, - const SkPaint& paint) SK_OVERRIDE {} + const SkPaint& paint) override {} virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint) SK_OVERRIDE {} + const SkPaint& paint) 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 {} - void onDrawPaint(const SkPaint& paint) SK_OVERRIDE {} + void onDrawPaint(const SkPaint& paint) override {} void onDrawPoints(PointMode mode, size_t count, const SkPoint pts[], - const SkPaint& paint) SK_OVERRIDE {} - void onDrawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE {} - void onDrawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE {} - void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE {} - void onDrawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE {} + const SkPaint& paint) override {} + void onDrawRect(const SkRect& rect, const SkPaint& paint) override {} + void onDrawOval(const SkRect& oval, const SkPaint&) override {} + void onDrawRRect(const SkRRect& rrect, 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 = NULL) SK_OVERRIDE {} + const SkPaint* paint = NULL) override {} void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, - 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& bitmap, const SkIRect& center, - const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE {} + const SkRect& dst, const SkPaint* paint = NULL) override {} void onDrawSprite(const SkBitmap& bitmap, int left, int top, - const SkPaint* paint = NULL) SK_OVERRIDE {} + const SkPaint* paint = NULL) 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 {} private: |