diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 04:00:17 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-23 04:00:17 +0000 |
| commit | e0d9ce890e67d02727ac2811bb456ddb64f827d4 (patch) | |
| tree | 82362792c7a566145a3acbea7ba465bb38dd26fe /experimental/PdfViewer/SkNulCanvas.h | |
| parent | ede0c5c7784ff4bd86e268d33df89c0ac432ca5b (diff) | |
Make drawText calls non-virtual, to ease SkFont and TextBlob (https://codereview.chromium.org/243853006/)"
associated chrome change (to be committed with DEPS roll)
https://codereview.chromium.org/248693002/
This reverts commit bfaceb53f58c9625b5471fcff35b5ca9ca3ae29c.
TBR=bsalomon@google.com
Review URL: https://codereview.chromium.org/248083002
git-svn-id: http://skia.googlecode.com/svn/trunk@14321 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/PdfViewer/SkNulCanvas.h')
| -rw-r--r-- | experimental/PdfViewer/SkNulCanvas.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 1c31e9d39c..f2befad344 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -47,16 +47,6 @@ public: const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE {} virtual void drawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint = NULL) 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[], @@ -99,6 +89,17 @@ protected: return kNoLayer_SaveLayerStrategy; } + virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, + SkScalar y, const SkPaint& paint) SK_OVERRIDE {} + virtual void onDrawPosText(const void* text, size_t byteLength, + const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE {} + virtual void onDrawPosTextH(const void* text, size_t byteLength, + const SkScalar xpos[], SkScalar constY, + const SkPaint& paint) SK_OVERRIDE {} + virtual void onDrawTextOnPath(const void* text, size_t byteLength, + const SkPath& path, const SkMatrix* matrix, + const SkPaint& paint) SK_OVERRIDE {} + virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {} |