aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/xps
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2018-06-06 17:45:53 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-06 17:46:05 +0000
commit41f4f31cd7dadd1123600c38faa8fef6bd7fb29c (patch)
tree1e2d604cd95be419d363e9b56aa5beaf3eb8818e /src/xps
parent2d7678d61fb68a2c9060a9fad8ebabf4e0053576 (diff)
Reland "Have draw(Text|PosText|PosTextH) use a single entry on the device"
This reverts commit 74b390d6b136a60f1df15ac5ecd19bd8ad5a394b. Reason for revert: reverting to add patch for valgrind Original change's description: > 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> TBR=jvanverth@google.com,halcanary@google.com,bungeman@google.com,herb@google.com Change-Id: I9bbb73aac447b51eb8215ac42331759fa4c9fa45 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/132580 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/xps')
-rw-r--r--src/xps/SkXPSDevice.cpp57
-rw-r--r--src/xps/SkXPSDevice.h2
2 files changed, 0 insertions, 59 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index 29ee8f3eca..ef5f48881d 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -2047,63 +2047,6 @@ private:
GlyphRun* const fXpsGlyphs;
};
-void SkXPSDevice::drawText(const void* text, size_t byteLen,
- SkScalar x, SkScalar y,
- const SkPaint& paint) {
- if (byteLen < 1) return;
-
- if (text_must_be_pathed(paint, this->ctm())) {
- SkPath path;
- paint.getTextPath(text, byteLen, x, y, &path);
- this->drawPath(path, paint, nullptr, true);
- //TODO: add automation "text"
- return;
- }
-
- TypefaceUse* typeface;
- HRV(CreateTypefaceUse(paint, &typeface));
-
- auto cache =
- SkStrikeCache::FindOrCreateStrikeExclusive(
- paint, &this->surfaceProps(),
- SkScalerContextFlags::kNone, nullptr);
-
- // Advance width and offsets for glyphs measured in hundredths of the font em size
- // (XPS Spec 5.1.3).
- FLOAT centemPerUnit = 100.0f / SkScalarToFLOAT(paint.getTextSize());
- GlyphRun xpsGlyphs;
- xpsGlyphs.setReserve(num_glyph_guess(paint.getTextEncoding(),
- static_cast<const char*>(text), byteLen));
-
- ProcessOneGlyph processOneGlyph(centemPerUnit, typeface->glyphsUsed, &xpsGlyphs);
-
- SkFindAndPlaceGlyph::ProcessText(
- paint.getTextEncoding(), static_cast<const char*>(text), byteLen,
- SkPoint{ x, y }, SkMatrix::I(), paint.getTextAlign(), cache.get(), processOneGlyph);
-
- if (xpsGlyphs.count() == 0) {
- return;
- }
-
- XPS_POINT origin = {
- xpsGlyphs[0].horizontalOffset / centemPerUnit,
- xpsGlyphs[0].verticalOffset / -centemPerUnit,
- };
- xpsGlyphs[0].horizontalOffset = 0.0f;
- xpsGlyphs[0].verticalOffset = 0.0f;
-
- HRV(AddGlyphs(this->fXpsFactory.get(),
- this->fCurrentXpsCanvas.get(),
- typeface,
- nullptr,
- xpsGlyphs.begin(), xpsGlyphs.count(),
- &origin,
- SkScalarToFLOAT(paint.getTextSize()),
- XPS_STYLE_SIMULATION_NONE,
- this->ctm(),
- paint));
-}
-
void SkXPSDevice::drawPosText(const void* text, size_t byteLen,
const SkScalar pos[], int scalarsPerPos,
const SkPoint& offset, const SkPaint& paint) {
diff --git a/src/xps/SkXPSDevice.h b/src/xps/SkXPSDevice.h
index a5ee07634c..81e881ea82 100644
--- a/src/xps/SkXPSDevice.h
+++ b/src/xps/SkXPSDevice.h
@@ -97,8 +97,6 @@ protected:
const SkRect* srcOrNull, const SkRect& dst,
const SkPaint& paint,
SkCanvas::SrcRectConstraint) override;
- void drawText(const void* text, size_t len,
- SkScalar x, SkScalar y, const SkPaint& paint) override;
void drawPosText(const void* text, size_t len,
const SkScalar pos[], int scalarsPerPos,
const SkPoint& offset, const SkPaint& paint) override;