summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-12 15:40:11 +0000
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-12 15:40:11 +0000
commit1f1c0d428453bea56d6092a89906fb668a7900f9 (patch)
tree7862f373cee75a01fef741982eeacc6266759012
parentc901098cfe8be1393e4c9ba6e3f19ad699c6492c (diff)
downloadsrc-1f1c0d428453bea56d6092a89906fb668a7900f9.tar.gz
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/src@10680 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--core/SkBBoxRecord.cpp8
-rw-r--r--core/SkBBoxRecord.h3
-rw-r--r--core/SkCanvas.cpp6
3 files changed, 0 insertions, 17 deletions
diff --git a/core/SkBBoxRecord.cpp b/core/SkBBoxRecord.cpp
index 666e4409..52d599f5 100644
--- a/core/SkBBoxRecord.cpp
+++ b/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/core/SkBBoxRecord.h b/core/SkBBoxRecord.h
index 16dd8fff..9f796717 100644
--- a/core/SkBBoxRecord.h
+++ b/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/core/SkCanvas.cpp b/core/SkCanvas.cpp
index 232bee33..5a9a56b2 100644
--- a/core/SkCanvas.cpp
+++ b/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) {