diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 18:53:36 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 18:53:36 +0000 |
| commit | 92c2e42deaea25cce90e266a6c691784762e068e (patch) | |
| tree | dabda2d373514fc8cc16d6ad7edf5f8fd4862d1f /skia/ext/analysis_canvas.h | |
| parent | 05214727a5a6410cd88f27df9eda1c0686899db6 (diff) | |
| download | chromium_src-92c2e42deaea25cce90e266a6c691784762e068e.zip chromium_src-92c2e42deaea25cce90e266a6c691784762e068e.tar.gz chromium_src-92c2e42deaea25cce90e266a6c691784762e068e.tar.bz2 | |
Roll Skia DEPS to 14324 from 14292
Control: https://codereview.chromium.org/246073010
NOTRY=true
R=reed@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/249563002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/analysis_canvas.h')
| -rw-r--r-- | skia/ext/analysis_canvas.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h index 922a3ee..efe9314 100644 --- a/skia/ext/analysis_canvas.h +++ b/skia/ext/analysis_canvas.h @@ -59,25 +59,6 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { const SkPaint* paint = NULL) OVERRIDE; virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* paint = NULL) OVERRIDE; - virtual void drawText(const void* text, - size_t byteLength, - SkScalar x, - SkScalar y, - const SkPaint&) OVERRIDE; - virtual void drawPosText(const void* text, - size_t byteLength, - const SkPoint pos[], - const SkPaint&) OVERRIDE; - virtual void drawPosTextH(const void* text, - size_t byteLength, - const SkScalar xpos[], - SkScalar constY, - const SkPaint&) OVERRIDE; - virtual void drawTextOnPath(const void* text, - size_t byteLength, - const SkPath& path, - const SkMatrix* matrix, - const SkPaint&) OVERRIDE; virtual void drawVertices(VertexMode, int vertexCount, const SkPoint vertices[], @@ -105,7 +86,27 @@ class SK_API AnalysisCanvas : public SkCanvas, public SkDrawPictureCallback { SkRegion::Op op, ClipEdgeStyle edge_style) OVERRIDE; - private: + virtual void onDrawText(const void* text, + size_t byteLength, + SkScalar x, + SkScalar y, + const SkPaint&) OVERRIDE; + virtual void onDrawPosText(const void* text, + size_t byteLength, + const SkPoint pos[], + const SkPaint&) OVERRIDE; + virtual void onDrawPosTextH(const void* text, + size_t byteLength, + const SkScalar xpos[], + SkScalar constY, + const SkPaint&) OVERRIDE; + virtual void onDrawTextOnPath(const void* text, + size_t byteLength, + const SkPath& path, + const SkMatrix* matrix, + const SkPaint&) OVERRIDE; + +private: typedef SkCanvas INHERITED; int saved_stack_size_; |