From 1cc07d940fcd10f52bf8228c272707f0f5df0b44 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Mon, 12 Aug 2013 15:40:11 +0000 Subject: [PATCH] Revert "Add SkCanvas::drawPosTextBounded." 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 --- include/core/SkCanvas.h | 12 ------------ src/core/SkBBoxRecord.cpp | 8 -------- src/core/SkBBoxRecord.h | 3 --- src/core/SkCanvas.cpp | 6 ------ 4 files changed, 29 deletions(-) diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index c3a18ee137..b4853f7f33 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -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. diff --git a/src/core/SkBBoxRecord.cpp b/src/core/SkBBoxRecord.cpp index 666e440958..52d599f57e 100644 --- a/src/core/SkBBoxRecord.cpp +++ b/src/core/SkBBoxRecord.cpp @@ -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; diff --git a/src/core/SkBBoxRecord.h b/src/core/SkBBoxRecord.h index 16dd8fff7a..9f796717e4 100644 --- a/src/core/SkBBoxRecord.h +++ b/src/core/SkBBoxRecord.h @@ -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; diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 232bee3375..5a9a56b2c1 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -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) {