diff options
Diffstat (limited to 'include/utils/SkDumpCanvas.h')
| -rw-r--r-- | include/utils/SkDumpCanvas.h | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index 3731bef..5bfd6f6 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #ifndef SkDumpCanvas_DEFINED #define SkDumpCanvas_DEFINED @@ -33,7 +40,6 @@ public: kDrawBitmap_Verb, kDrawText_Verb, kDrawPicture_Verb, - kDrawShape_Verb, kDrawVertices_Verb, kDrawData_Verb }; @@ -52,58 +58,53 @@ public: int getNestLevel() const { return fNestLevel; } - // overrides from SkCanvas - - virtual int save(SaveFlags flags = kMatrixClip_SaveFlag); + virtual int save(SaveFlags) SK_OVERRIDE; virtual int saveLayer(const SkRect* bounds, const SkPaint* paint, - SaveFlags flags = kARGB_ClipLayer_SaveFlag); - virtual void restore(); + SaveFlags) SK_OVERRIDE; + virtual void restore() SK_OVERRIDE; - virtual bool translate(SkScalar dx, SkScalar dy); - virtual bool scale(SkScalar sx, SkScalar sy); - virtual bool rotate(SkScalar degrees); - virtual bool skew(SkScalar sx, SkScalar sy); - virtual bool concat(const SkMatrix& matrix); - virtual void setMatrix(const SkMatrix& matrix); + virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE; + virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; + virtual bool rotate(SkScalar degrees) SK_OVERRIDE; + virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE; + virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE; + virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; - virtual bool clipRect(const SkRect& rect, - SkRegion::Op op = SkRegion::kIntersect_Op); - virtual bool clipPath(const SkPath& path, - SkRegion::Op op = SkRegion::kIntersect_Op); + virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE; + virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE; virtual bool clipRegion(const SkRegion& deviceRgn, - SkRegion::Op op = SkRegion::kIntersect_Op); + SkRegion::Op) SK_OVERRIDE; - virtual void drawPaint(const SkPaint& paint); + virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[], - const SkPaint& paint); - virtual void drawRect(const SkRect& rect, const SkPaint& paint); - virtual void drawPath(const SkPath& path, const SkPaint& paint); + const SkPaint& paint) SK_OVERRIDE; + virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE; + virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE; virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, - const SkPaint* paint = NULL); + const SkPaint* paint) SK_OVERRIDE; virtual void drawBitmapRect(const SkBitmap& bitmap, const SkIRect* src, - const SkRect& dst, const SkPaint* paint = NULL); + const SkRect& dst, const SkPaint* paint) SK_OVERRIDE; virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, - const SkPaint* paint = NULL); + const SkPaint* paint) SK_OVERRIDE; virtual void drawSprite(const SkBitmap& bitmap, int left, int top, - const SkPaint* paint = NULL); + const SkPaint* paint) SK_OVERRIDE; virtual void drawText(const void* text, size_t byteLength, SkScalar x, - SkScalar y, const SkPaint& paint); + SkScalar y, const SkPaint& paint) SK_OVERRIDE; virtual void drawPosText(const void* text, size_t byteLength, - const SkPoint pos[], const SkPaint& paint); + const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE; virtual void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, - const SkPaint& paint); + const SkPaint& paint) SK_OVERRIDE; virtual void drawTextOnPath(const void* text, size_t byteLength, const SkPath& path, const SkMatrix* matrix, - const SkPaint& paint); - virtual void drawPicture(SkPicture&); - virtual void drawShape(SkShape*); + const SkPaint& paint) SK_OVERRIDE; + virtual void drawPicture(SkPicture&) SK_OVERRIDE; virtual void drawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint& paint); - virtual void drawData(const void*, size_t); + const SkPaint& paint) SK_OVERRIDE; + virtual void drawData(const void*, size_t) SK_OVERRIDE; private: Dumper* fDumper; @@ -124,7 +125,7 @@ public: // override from baseclass that does the formatting, and in turn calls // the function pointer that was passed to the constructor virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[], - const SkPaint*); + const SkPaint*) SK_OVERRIDE; private: void (*fProc)(const char*, void*); |