Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: include/utils/SkProxyCanvas.h

Issue 248083002: Make drawText calls non-virtual, to ease SkFont and TextBlob (https://codereview.chromium.org/24385… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « include/utils/SkNWayCanvas.h ('k') | src/core/SkBBoxRecord.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef SkProxyCanvas_DEFINED 8 #ifndef SkProxyCanvas_DEFINED
9 #define SkProxyCanvas_DEFINED 9 #define SkProxyCanvas_DEFINED
10 10
(...skipping 24 matching lines...) Expand all
35 virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE; 35 virtual void drawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE;
36 virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, 36 virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
37 const SkPaint* paint = NULL) SK_OVERRIDE; 37 const SkPaint* paint = NULL) SK_OVERRIDE;
38 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, 38 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
39 const SkRect& dst, const SkPaint* paint, 39 const SkRect& dst, const SkPaint* paint,
40 DrawBitmapRectFlags flags) SK_OVERRIDE; 40 DrawBitmapRectFlags flags) SK_OVERRIDE;
41 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, 41 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
42 const SkPaint* paint = NULL) SK_OVERRIDE; 42 const SkPaint* paint = NULL) SK_OVERRIDE;
43 virtual void drawSprite(const SkBitmap& bitmap, int left, int top, 43 virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
44 const SkPaint* paint = NULL) SK_OVERRIDE; 44 const SkPaint* paint = NULL) SK_OVERRIDE;
45 virtual void drawText(const void* text, size_t byteLength, SkScalar x,
46 SkScalar y, const SkPaint& paint) SK_OVERRIDE;
47 virtual void drawPosText(const void* text, size_t byteLength,
48 const SkPoint pos[], const SkPaint& paint) SK_OVERR IDE;
49 virtual void drawPosTextH(const void* text, size_t byteLength,
50 const SkScalar xpos[], SkScalar constY,
51 const SkPaint& paint) SK_OVERRIDE;
52 virtual void drawTextOnPath(const void* text, size_t byteLength,
53 const SkPath& path, const SkMatrix* matrix,
54 const SkPaint& paint) SK_OVERRIDE;
55 virtual void drawPicture(SkPicture&) SK_OVERRIDE; 45 virtual void drawPicture(SkPicture&) SK_OVERRIDE;
56 virtual void drawVertices(VertexMode vmode, int vertexCount, 46 virtual void drawVertices(VertexMode vmode, int vertexCount,
57 const SkPoint vertices[], const SkPoint texs[], 47 const SkPoint vertices[], const SkPoint texs[],
58 const SkColor colors[], SkXfermode* xmode, 48 const SkColor colors[], SkXfermode* xmode,
59 const uint16_t indices[], int indexCount, 49 const uint16_t indices[], int indexCount,
60 const SkPaint& paint) SK_OVERRIDE; 50 const SkPaint& paint) SK_OVERRIDE;
61 virtual void drawData(const void* data, size_t length) SK_OVERRIDE; 51 virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
62 52
63 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; 53 virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
64 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; 54 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
65 virtual void endCommentGroup() SK_OVERRIDE; 55 virtual void endCommentGroup() SK_OVERRIDE;
66 56
67 virtual SkBounder* setBounder(SkBounder* bounder) SK_OVERRIDE; 57 virtual SkBounder* setBounder(SkBounder* bounder) SK_OVERRIDE;
68 virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; 58 virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE;
69 59
70 protected: 60 protected:
71 virtual void willSave(SaveFlags) SK_OVERRIDE; 61 virtual void willSave(SaveFlags) SK_OVERRIDE;
72 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF lags) SK_OVERRIDE; 62 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF lags) SK_OVERRIDE;
73 virtual void willRestore() SK_OVERRIDE; 63 virtual void willRestore() SK_OVERRIDE;
74 64
75 virtual void didConcat(const SkMatrix&) SK_OVERRIDE; 65 virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
76 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; 66 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
77 67
78 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK _OVERRIDE; 68 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK _OVERRIDE;
69 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y,
70 const SkPaint&) SK_OVERRIDE;
71 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[],
72 const SkPaint&) SK_OVERRIDE;
73 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[],
74 SkScalar constY, const SkPaint&) SK_OVERRIDE;
75 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath& path,
76 const SkMatrix* matrix, const SkPaint&) SK_OVE RRIDE;
79 77
80 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE; 78 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE;
81 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVE RRIDE; 79 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVE RRIDE;
82 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE; 80 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE;
83 virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; 81 virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
84 82
85 private: 83 private:
86 SkCanvas* fProxy; 84 SkCanvas* fProxy;
87 85
88 typedef SkCanvas INHERITED; 86 typedef SkCanvas INHERITED;
89 }; 87 };
90 88
91 #endif 89 #endif
OLDNEW
« no previous file with comments | « include/utils/SkNWayCanvas.h ('k') | src/core/SkBBoxRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698