diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-07-17 08:59:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-17 17:01:20 +0000 |
| commit | 53c876900247ad700ce28f7b33031047a6cff402 (patch) | |
| tree | d3dbf21cb7c6b7b2af6a718ce0a431b0f5404b2a /src/pipe | |
| parent | 462417d3d8683a8efe3b4d5813b972e478655ac3 (diff) | |
remove unused untested parts of text blob
SkTextBlob has a number of untested entry points
to serialize and deserialize. Privitize ones only used
by Skia, and remove ones suspected to be unused
and untested.
R=fmalita@chromium.org
TBR=reed@google.com,bsalomon@google.com
Bug: skia:6818
Change-Id: I6a9982a26a883982af3592f3302029a1bcdf5aa3
Reviewed-on: https://skia-review.googlesource.com/141820
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkPipeCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/pipe/SkPipeReader.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index aabff5bfae..258160c4fe 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -20,7 +20,7 @@ #include "SkRSXform.h" #include "SkShader.h" #include "SkStream.h" -#include "SkTextBlob.h" +#include "SkTextBlobPriv.h" #include "SkTo.h" #include "SkTypeface.h" @@ -680,7 +680,7 @@ void SkPipeCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y const SkPaint &paint) { SkPipeWriter writer(this); writer.write32(pack_verb(SkPipeVerb::kDrawTextBlob, 0)); - blob->flatten(writer); + SkTextBlobPriv::Flatten(*blob, writer); writer.writeScalar(x); writer.writeScalar(y); write_paint(writer, paint, kTextBlob_PaintUsage); diff --git a/src/pipe/SkPipeReader.cpp b/src/pipe/SkPipeReader.cpp index a37af5532a..909276f41b 100644 --- a/src/pipe/SkPipeReader.cpp +++ b/src/pipe/SkPipeReader.cpp @@ -16,7 +16,7 @@ #include "SkReadBuffer.h" #include "SkRefSet.h" #include "SkRSXform.h" -#include "SkTextBlob.h" +#include "SkTextBlobPriv.h" #include "SkTypeface.h" #include "SkVertices.h" @@ -401,7 +401,7 @@ static void drawTextOnPath_handler(SkPipeReader& reader, uint32_t packedVerb, Sk } static void drawTextBlob_handler(SkPipeReader& reader, uint32_t packedVerb, SkCanvas* canvas) { - sk_sp<SkTextBlob> tb = SkTextBlob::MakeFromBuffer(reader); + sk_sp<SkTextBlob> tb = SkTextBlobPriv::MakeFromBuffer(reader); SkScalar x = reader.readScalar(); SkScalar y = reader.readScalar(); canvas->drawTextBlob(tb, x, y, read_paint(reader)); |