OLD | NEW |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 #ifndef SkNWayCanvas_DEFINED | 9 #ifndef SkNWayCanvas_DEFINED |
10 #define SkNWayCanvas_DEFINED | 10 #define SkNWayCanvas_DEFINED |
(...skipping 20 matching lines...) Expand all Loading... | |
31 virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; | 31 virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; |
32 virtual bool rotate(SkScalar degrees) SK_OVERRIDE; | 32 virtual bool rotate(SkScalar degrees) SK_OVERRIDE; |
33 virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE; | 33 virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE; |
34 virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE; | 34 virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE; |
35 virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; | 35 virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; |
36 virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE; | 36 virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE; |
37 virtual bool clipRRect(const SkRRect&, SkRegion::Op, bool) SK_OVERRIDE; | 37 virtual bool clipRRect(const SkRRect&, SkRegion::Op, bool) SK_OVERRIDE; |
38 virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE; | 38 virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE; |
39 virtual bool clipRegion(const SkRegion& deviceRgn, | 39 virtual bool clipRegion(const SkRegion& deviceRgn, |
40 SkRegion::Op) SK_OVERRIDE; | 40 SkRegion::Op) SK_OVERRIDE; |
41 | 41 virtual void clear(SkColor) SK_OVERRIDE; |
enne (OOO)
2013/11/13 23:41:32
This was the real fix. The other functions were a
| |
42 virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE; | 42 virtual void drawPaint(const SkPaint& paint) SK_OVERRIDE; |
43 virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[], | 43 virtual void drawPoints(PointMode mode, size_t count, const SkPoint pts[], |
44 const SkPaint&) SK_OVERRIDE; | 44 const SkPaint&) SK_OVERRIDE; |
45 virtual void drawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; | |
enne (OOO)
2013/11/13 23:41:32
This is just a reordering to be consistent with Sk
| |
45 virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; | 46 virtual void drawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; |
46 virtual void drawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; | |
47 virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; | 47 virtual void drawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; |
48 virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE; | 48 virtual void drawPath(const SkPath& path, const SkPaint&) SK_OVERRIDE; |
49 virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, | 49 virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, |
50 const SkPaint*) SK_OVERRIDE; | 50 const SkPaint*) SK_OVERRIDE; |
51 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, | 51 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, |
52 const SkRect& dst, const SkPaint* paint, | 52 const SkRect& dst, const SkPaint* paint, |
53 DrawBitmapRectFlags flags) SK_OVERRIDE; | 53 DrawBitmapRectFlags flags) SK_OVERRIDE; |
54 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, | 54 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, |
55 const SkPaint*) SK_OVERRIDE; | 55 const SkPaint*) SK_OVERRIDE; |
56 virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, | |
57 const SkRect& dst, | |
58 const SkPaint* paint = NULL) SK_OVERRIDE; | |
56 virtual void drawSprite(const SkBitmap& bitmap, int left, int top, | 59 virtual void drawSprite(const SkBitmap& bitmap, int left, int top, |
57 const SkPaint*) SK_OVERRIDE; | 60 const SkPaint*) SK_OVERRIDE; |
58 virtual void drawText(const void* text, size_t byteLength, SkScalar x, | 61 virtual void drawText(const void* text, size_t byteLength, SkScalar x, |
59 SkScalar y, const SkPaint&) SK_OVERRIDE; | 62 SkScalar y, const SkPaint&) SK_OVERRIDE; |
60 virtual void drawPosText(const void* text, size_t byteLength, | 63 virtual void drawPosText(const void* text, size_t byteLength, |
61 const SkPoint pos[], const SkPaint&) SK_OVERRIDE; | 64 const SkPoint pos[], const SkPaint&) SK_OVERRIDE; |
62 virtual void drawPosTextH(const void* text, size_t byteLength, | 65 virtual void drawPosTextH(const void* text, size_t byteLength, |
63 const SkScalar xpos[], SkScalar constY, | 66 const SkScalar xpos[], SkScalar constY, |
64 const SkPaint&) SK_OVERRIDE; | 67 const SkPaint&) SK_OVERRIDE; |
65 virtual void drawTextOnPath(const void* text, size_t byteLength, | 68 virtual void drawTextOnPath(const void* text, size_t byteLength, |
66 const SkPath& path, const SkMatrix* matrix, | 69 const SkPath& path, const SkMatrix* matrix, |
67 const SkPaint&) SK_OVERRIDE; | 70 const SkPaint&) SK_OVERRIDE; |
68 virtual void drawPicture(SkPicture&) SK_OVERRIDE; | 71 virtual void drawPicture(SkPicture&) SK_OVERRIDE; |
69 virtual void drawVertices(VertexMode vmode, int vertexCount, | 72 virtual void drawVertices(VertexMode vmode, int vertexCount, |
70 const SkPoint vertices[], const SkPoint texs[], | 73 const SkPoint vertices[], const SkPoint texs[], |
71 const SkColor colors[], SkXfermode* xmode, | 74 const SkColor colors[], SkXfermode* xmode, |
72 const uint16_t indices[], int indexCount, | 75 const uint16_t indices[], int indexCount, |
73 const SkPaint&) SK_OVERRIDE; | 76 const SkPaint&) SK_OVERRIDE; |
77 virtual void drawData(const void* data, size_t length) SK_OVERRIDE; | |
74 | 78 |
75 virtual SkBounder* setBounder(SkBounder*) SK_OVERRIDE; | 79 virtual SkBounder* setBounder(SkBounder*) SK_OVERRIDE; |
76 virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; | 80 virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; |
77 | 81 |
78 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; | 82 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; |
79 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; | 83 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; |
80 virtual void endCommentGroup() SK_OVERRIDE; | 84 virtual void endCommentGroup() SK_OVERRIDE; |
81 | 85 |
82 protected: | 86 protected: |
83 SkTDArray<SkCanvas*> fList; | 87 SkTDArray<SkCanvas*> fList; |
84 | 88 |
85 class Iter; | 89 class Iter; |
86 | 90 |
87 private: | 91 private: |
88 typedef SkCanvas INHERITED; | 92 typedef SkCanvas INHERITED; |
89 }; | 93 }; |
90 | 94 |
91 | 95 |
92 #endif | 96 #endif |
OLD | NEW |