include/utils/SkDeferredCanvas.h - Issue 243853006: make drawText calls non-virtual, to ease SkFont and TextBlob

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/utils/SkDeferredCanvas.h

Issue 243853006: make drawText calls non-virtual, to ease SkFont and TextBlob (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: update SkRecord, don't infinitely recurse in SkBBoxRecord 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 side-by-side diff with in-line comments

Download patch

Index: include/utils/SkDeferredCanvas.h

diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h

index e12cbf03cc4ea3eae25d0e5391a28a9d138934d4..c4a41cad73d2b79e84d32e593b6466867e08ecf2 100644

--- a/include/utils/SkDeferredCanvas.h

+++ b/include/utils/SkDeferredCanvas.h

@@ -162,17 +162,6 @@ public:

SK_OVERRIDE;

virtual void drawSprite(const SkBitmap& bitmap, int left, int top,

const SkPaint* paint) SK_OVERRIDE;

- virtual void drawText(const void* text, size_t byteLength, SkScalar x,

- SkScalar y, const SkPaint& paint) SK_OVERRIDE;

- virtual void drawPosText(const void* text, size_t byteLength,

- 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) SK_OVERRIDE;

- virtual void drawTextOnPath(const void* text, size_t byteLength,

- const SkPath& path, const SkMatrix* matrix,

- const SkPaint& paint) SK_OVERRIDE;

virtual void drawPicture(SkPicture& picture) SK_OVERRIDE;

virtual void drawVertices(VertexMode vmode, int vertexCount,

const SkPoint vertices[], const SkPoint texs[],

@@ -190,8 +179,15 @@ protected:

virtual void didConcat(const SkMatrix&) SK_OVERRIDE;

virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE;

- virtual void onDrawDRRect(const SkRRect&, const SkRRect&,

- const SkPaint&) SK_OVERRIDE;

+ virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;

+ virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,

+ const SkPaint&) SK_OVERRIDE;

+ virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],

+ const SkPaint&) SK_OVERRIDE;

+ virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],

+ SkScalar constY, const SkPaint&) SK_OVERRIDE;

+ virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,

+ const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;

virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;

virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;

« no previous file with comments | « include/core/SkCanvas.h ('k') | include/utils/SkDumpCanvas.h » ('j') | no next file with comments »