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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 247983003: Revert of make drawText calls non-virtual, to ease SkFont and TextBlob (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/SkLuaCanvas.h ('k') | include/utils/SkProxyCanvas.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 8
9 #ifndef SkNWayCanvas_DEFINED 9 #ifndef SkNWayCanvas_DEFINED
10 #define SkNWayCanvas_DEFINED 10 #define SkNWayCanvas_DEFINED
(...skipping 25 matching lines...) Expand all
36 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, 36 virtual void drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
37 const SkRect& dst, const SkPaint* paint, 37 const SkRect& dst, const SkPaint* paint,
38 DrawBitmapRectFlags flags) SK_OVERRIDE; 38 DrawBitmapRectFlags flags) SK_OVERRIDE;
39 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m, 39 virtual void drawBitmapMatrix(const SkBitmap& bitmap, const SkMatrix& m,
40 const SkPaint*) SK_OVERRIDE; 40 const SkPaint*) SK_OVERRIDE;
41 virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, 41 virtual void drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
42 const SkRect& dst, 42 const SkRect& dst,
43 const SkPaint* paint = NULL) SK_OVERRIDE; 43 const SkPaint* paint = NULL) SK_OVERRIDE;
44 virtual void drawSprite(const SkBitmap& bitmap, int left, int top, 44 virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
45 const SkPaint*) SK_OVERRIDE; 45 const SkPaint*) SK_OVERRIDE;
46 virtual void drawText(const void* text, size_t byteLength, SkScalar x,
47 SkScalar y, const SkPaint&) SK_OVERRIDE;
48 virtual void drawPosText(const void* text, size_t byteLength,
49 const SkPoint pos[], const SkPaint&) SK_OVERRIDE;
50 virtual void drawPosTextH(const void* text, size_t byteLength,
51 const SkScalar xpos[], SkScalar constY,
52 const SkPaint&) SK_OVERRIDE;
53 virtual void drawTextOnPath(const void* text, size_t byteLength,
54 const SkPath& path, const SkMatrix* matrix,
55 const SkPaint&) SK_OVERRIDE;
46 virtual void drawPicture(SkPicture&) SK_OVERRIDE; 56 virtual void drawPicture(SkPicture&) SK_OVERRIDE;
47 virtual void drawVertices(VertexMode vmode, int vertexCount, 57 virtual void drawVertices(VertexMode vmode, int vertexCount,
48 const SkPoint vertices[], const SkPoint texs[], 58 const SkPoint vertices[], const SkPoint texs[],
49 const SkColor colors[], SkXfermode* xmode, 59 const SkColor colors[], SkXfermode* xmode,
50 const uint16_t indices[], int indexCount, 60 const uint16_t indices[], int indexCount,
51 const SkPaint&) SK_OVERRIDE; 61 const SkPaint&) SK_OVERRIDE;
52 virtual void drawData(const void* data, size_t length) SK_OVERRIDE; 62 virtual void drawData(const void* data, size_t length) SK_OVERRIDE;
53 63
54 virtual SkBounder* setBounder(SkBounder*) SK_OVERRIDE; 64 virtual SkBounder* setBounder(SkBounder*) SK_OVERRIDE;
55 virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; 65 virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE;
56 66
57 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; 67 virtual void beginCommentGroup(const char* description) SK_OVERRIDE;
58 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; 68 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE;
59 virtual void endCommentGroup() SK_OVERRIDE; 69 virtual void endCommentGroup() SK_OVERRIDE;
60 70
61 protected: 71 protected:
62 SkTDArray<SkCanvas*> fList; 72 SkTDArray<SkCanvas*> fList;
63 73
64 virtual void willSave(SaveFlags) SK_OVERRIDE; 74 virtual void willSave(SaveFlags) SK_OVERRIDE;
65 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF lags) SK_OVERRIDE; 75 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF lags) SK_OVERRIDE;
66 virtual void willRestore() SK_OVERRIDE; 76 virtual void willRestore() SK_OVERRIDE;
67 77
68 virtual void didConcat(const SkMatrix&) SK_OVERRIDE; 78 virtual void didConcat(const SkMatrix&) SK_OVERRIDE;
69 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; 79 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;
70 80
71 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK _OVERRIDE; 81 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK _OVERRIDE;
72 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y,
73 const SkPaint&) SK_OVERRIDE;
74 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[],
75 const SkPaint&) SK_OVERRIDE;
76 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[],
77 SkScalar constY, const SkPaint&) SK_OVERRIDE;
78 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath& path,
79 const SkMatrix* matrix, const SkPaint&) SK_OVE RRIDE;
80 82
81 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE; 83 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE;
82 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVE RRIDE; 84 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVE RRIDE;
83 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE; 85 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERR IDE;
84 virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; 86 virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
85 87
86 class Iter; 88 class Iter;
87 89
88 private: 90 private:
89 typedef SkCanvas INHERITED; 91 typedef SkCanvas INHERITED;
90 }; 92 };
91 93
92 94
93 #endif 95 #endif
OLDNEW
« no previous file with comments | « include/utils/SkLuaCanvas.h ('k') | include/utils/SkProxyCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698