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

Revert "Add SkCanvas::drawPosTextBounded."

Browse Source 
This reverts commit e158aea941a6202a40b75fcee013d002089854bb.

This was an experimental API change. We will reintroduce this feature
with a different API approach, and support it w/ detailed testing
and performance measurements.

BUG=
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/22861002

git-svn-id: http://skia.googlecode.com/svn/trunk@10680 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-08-12 15:40:11 +00:00
parent 2cad2c04c3
commit 1cc07d940f
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/SkCanvas.h
View File

@ -750,18 +750,6 @@ public:
virtual void drawPosText(const void* text, size_t byteLength,
const SkPoint pos[], const SkPaint& paint);
/** Draw the text, with each character/glyph origin specified by the pos[]
array. The origin is interpreted by the Align setting in the paint.
@param text The text to be drawn
@param byteLength The number of bytes to read from the text parameter
@param pos Array of positions, used to position each character
@param bbox Precomputed bounding box of the text.
@param paint The paint used for the text (e.g. color, size, style)
*/
virtual void drawPosTextBounded(const void* text, size_t byteLength,
const SkPoint pos[], const SkRect& bbox,
const SkPaint& paint);
/** 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.
The origin is interpreted by the Align setting in the paint.

8
src/core/SkBBoxRecord.cpp
View File

@ -176,14 +176,6 @@ void SkBBoxRecord::drawPosText(const void* text, size_t byteLength,
}
}
void SkBBoxRecord::drawPosTextBounded(const void* text, size_t byteLength,
const SkPoint pos[], const SkRect& bbox,
const SkPaint& paint) {
if (this->transformBounds(bbox, &paint)) {
INHERITED::drawPosText(text, byteLength, pos, paint);
}
}
void SkBBoxRecord::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
SkScalar constY, const SkPaint& paint) {
SkRect bbox;

3
src/core/SkBBoxRecord.h
View File

@ -49,9 +49,6 @@ public:
const SkRect& dst, const SkPaint* paint) SK_OVERRIDE;
virtual void drawPosText(const void* text, size_t byteLength,
const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE;
virtual void drawPosTextBounded(const void* text, size_t byteLength,
const SkPoint pos[], const SkRect& bbox,
const SkPaint& paint) SK_OVERRIDE;
virtual void drawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
const SkPaint& paint) SK_OVERRIDE;

6
src/core/SkCanvas.cpp
View File

@ -1990,12 +1990,6 @@ void SkCanvas::drawPosText(const void* text, size_t byteLength,
LOOPER_END
}
void SkCanvas::drawPosTextBounded(const void* text, size_t byteLength,
const SkPoint pos[], const SkRect& bbox,
const SkPaint& paint) {
this->drawPosText(text, byteLength, pos, paint);
}
void SkCanvas::drawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
const SkPaint& paint) {