AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed dead SK_SUPPORT_LEGACY_DRAWTEXT_VIRTUAL code

Browse Source 
BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/817193002
This commit is contained in:
reed 2014-12-21 11:38:35 -08:00 committed by Commit bot
parent c8a21311e7
commit f7430ccfc0
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/core/SkCanvas.h
View File

@ -19,12 +19,6 @@
#include "SkSurfaceProps.h" #include "SkSurfaceProps.h"
#include "SkXfermode.h" #include "SkXfermode.h"
#ifdef SK_SUPPORT_LEGACY_DRAWTEXT_VIRTUAL
#define SK_LEGACY_DRAWTEXT_VIRTUAL virtual
#else
#define SK_LEGACY_DRAWTEXT_VIRTUAL
#endif
class SkBaseDevice; class SkBaseDevice;
class SkCanvasClipVisitor; class SkCanvasClipVisitor;
class SkCanvasDrawable; class SkCanvasDrawable;
@ -887,8 +881,8 @@ public:
@param y The y-coordinate of the origin of the text being drawn @param y The y-coordinate of the origin of the text being drawn
@param paint The paint used for the text (e.g. color, size, style) @param paint The paint used for the text (e.g. color, size, style)
*/ */
SK_LEGACY_DRAWTEXT_VIRTUAL void drawText(const void* text, size_t byteLength, SkScalar x, void drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
SkScalar y, const SkPaint& paint); const SkPaint& paint);
/** Draw the text, with each character/glyph origin specified by the pos[] /** Draw the text, with each character/glyph origin specified by the pos[]
array. The origin is interpreted by the Align setting in the paint. array. The origin is interpreted by the Align setting in the paint.
@ -897,8 +891,8 @@ public:
@param pos Array of positions, used to position each character @param pos Array of positions, used to position each character
@param paint The paint used for the text (e.g. color, size, style) @param paint The paint used for the text (e.g. color, size, style)
*/ */
SK_LEGACY_DRAWTEXT_VIRTUAL void drawPosText(const void* text, size_t byteLength, void drawPosText(const void* text, size_t byteLength, const SkPoint pos[],
const SkPoint pos[], const SkPaint& paint); const SkPaint& paint);
/** Draw the text, with each character/glyph origin specified by the x /** Draw the text, with each character/glyph origin specified by the x
coordinate taken from the xpos[] array, and the y from the constY param. coordinate taken from the xpos[] array, and the y from the constY param.
@ -909,9 +903,8 @@ public:
@param constY The shared Y coordinate for all of the positions @param constY The shared Y coordinate for all of the positions
@param paint The paint used for the text (e.g. color, size, style) @param paint The paint used for the text (e.g. color, size, style)
*/ */
SK_LEGACY_DRAWTEXT_VIRTUAL void drawPosTextH(const void* text, size_t byteLength, void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY,
const SkScalar xpos[], SkScalar constY, const SkPaint& paint);
const SkPaint& paint);
/** Draw the text, with origin at (x,y), using the specified paint, along /** Draw the text, with origin at (x,y), using the specified paint, along
the specified path. The paint's Align setting determins where along the the specified path. The paint's Align setting determins where along the
@ -925,8 +918,7 @@ public:
position the text position the text
@param paint The paint used for the text @param paint The paint used for the text
*/ */
void drawTextOnPathHV(const void* text, size_t byteLength, void drawTextOnPathHV(const void* text, size_t byteLength, const SkPath& path, SkScalar hOffset,
const SkPath& path, SkScalar hOffset,
SkScalar vOffset, const SkPaint& paint); SkScalar vOffset, const SkPaint& paint);
/** Draw the text, with origin at (x,y), using the specified paint, along /** Draw the text, with origin at (x,y), using the specified paint, along
@ -939,9 +931,8 @@ public:
mapped onto the path mapped onto the path
@param paint The paint used for the text @param paint The paint used for the text
*/ */
SK_LEGACY_DRAWTEXT_VIRTUAL void drawTextOnPath(const void* text, size_t byteLength, void drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
const SkPath& path, const SkMatrix* matrix, const SkMatrix* matrix, const SkPaint& paint);
const SkPaint& paint);
/** Draw the text blob, offset by (x,y), using the specified paint. /** Draw the text blob, offset by (x,y), using the specified paint.
@param blob The text blob to be drawn @param blob The text blob to be drawn