diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-06 13:29:51 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-06 13:29:57 +0000 |
| commit | 74b390d6b136a60f1df15ac5ecd19bd8ad5a394b (patch) | |
| tree | afba5f9d8d8d802e9b6873c5f4c7948a94f76762 /src/pdf | |
| parent | 102c8cf26e2886ba783a2b54827e1f5d1cf0a774 (diff) | |
Revert "Have draw(Text|PosText|PosTextH) use a single entry on the device"
This reverts commit 4225b3220ef4bf50f0d9403f812ea94d50c4ee59.
Reason for revert: made valgrind unhappy.
Original change's description:
> Have draw(Text|PosText|PosTextH) use a single entry on the device
>
> Handle the positioning of drawText at the canvas layer. Simplify
> the code by removing similar implementations.
>
> Change-Id: I8b711783435072f560e29fca1dd934fa2e345ed2
> Reviewed-on: https://skia-review.googlesource.com/127131
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
TBR=jvanverth@google.com,bungeman@google.com,herb@google.com
Change-Id: I65c9d30ae6ecb1f87e8660e56d8f8ce5daab7551
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/132403
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 6 | ||||
| -rw-r--r-- | src/pdf/SkPDFDevice.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index f4c034e1ef..1cf649c1a1 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -1450,6 +1450,12 @@ void SkPDFDevice::internalDrawText( } } +void SkPDFDevice::drawText(const void* text, size_t len, + SkScalar x, SkScalar y, const SkPaint& paint) { + this->internalDrawText(text, len, nullptr, SkTextBlob::kDefault_Positioning, + SkPoint{x, y}, paint, nullptr, 0, nullptr); +} + void SkPDFDevice::drawPosText(const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint& paint) { diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h index 33d0e70e67..a9c0590bed 100644 --- a/src/pdf/SkPDFDevice.h +++ b/src/pdf/SkPDFDevice.h @@ -95,6 +95,8 @@ public: const SkRect& dst, const SkPaint&, SkCanvas::SrcRectConstraint) override; + void drawText(const void* text, size_t len, + SkScalar x, SkScalar y, const SkPaint&) override; void drawPosText(const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, const SkPoint& offset, const SkPaint&) override; |