diff options
author | 2014-09-12 08:49:54 -0700 | |
---|---|---|
committer | 2014-09-12 08:49:54 -0700 | |
commit | 83658305a1bda2d862f50145ecf5cb697b575e86 (patch) | |
tree | df703fa071c3aee76083d1f08a3aa4c7d8f1f72c /src/core/SkPaint.cpp | |
parent | 1f777e8580a67f2f975151bc414a1695696aa635 (diff) |
remove confusing/unused stream methods
BUG=skia:
R=bungeman@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/563273003
Diffstat (limited to 'src/core/SkPaint.cpp')
-rw-r--r-- | src/core/SkPaint.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 5d7c2cc3eb..1c2f8e83a6 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -2307,17 +2307,20 @@ const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc, } #ifndef SK_IGNORE_TO_STRING + +static SkFontDescriptor typeface_getDescriptor(const SkTypeface* face) { + SkDynamicMemoryWStream ostream; + face->serialize(&ostream); + SkAutoTUnref<SkStreamAsset> istream(ostream.detachAsStream()); + return SkFontDescriptor(istream); +} + void SkPaint::toString(SkString* str) const { str->append("<dl><dt>SkPaint:</dt><dd><dl>"); SkTypeface* typeface = this->getTypeface(); if (typeface) { - SkDynamicMemoryWStream ostream; - typeface->serialize(&ostream); - SkAutoTUnref<SkData> data(ostream.copyToData()); - - SkMemoryStream stream(data); - SkFontDescriptor descriptor(&stream); + SkFontDescriptor descriptor(typeface_getDescriptor(typeface)); str->append("<dt>Font Family Name:</dt><dd>"); str->append(descriptor.getFamilyName()); |