diff options
author | bungeman <bungeman@google.com> | 2016-05-11 12:38:18 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-11 12:38:18 -0700 |
commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /src/core/SkFont.cpp | |
parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'src/core/SkFont.cpp')
-rw-r--r-- | src/core/SkFont.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp index c39cc185d3..1300011ec4 100644 --- a/src/core/SkFont.cpp +++ b/src/core/SkFont.cpp @@ -9,13 +9,9 @@ #include "SkTypeface.h" #include "SkUtils.h" -static SkTypeface* ref_or_default(SkTypeface* face) { - return face ? SkRef(face) : SkTypeface::RefDefault(); -} - -SkFont::SkFont(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX, MaskType mt, +SkFont::SkFont(sk_sp<SkTypeface> face, SkScalar size, SkScalar scaleX, SkScalar skewX, MaskType mt, uint32_t flags) - : fTypeface(ref_or_default(face)) + : fTypeface(face ? std::move(face) : SkTypeface::MakeDefault()) , fSize(size) , fScaleX(scaleX) , fSkewX(skewX) @@ -28,8 +24,8 @@ SkFont::SkFont(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX, SkASSERT(0 == (flags & ~kAllFlags)); } -SkFont* SkFont::Create(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScalar skewX, - MaskType mt, uint32_t flags) { +sk_sp<SkFont> SkFont::Make(sk_sp<SkTypeface> face, SkScalar size, SkScalar scaleX, SkScalar skewX, + MaskType mt, uint32_t flags) { if (size <= 0 || !SkScalarIsFinite(size)) { return nullptr; } @@ -40,24 +36,20 @@ SkFont* SkFont::Create(SkTypeface* face, SkScalar size, SkScalar scaleX, SkScala return nullptr; } flags &= kAllFlags; - return new SkFont(face, size, scaleX, skewX, mt, flags); + return sk_sp<SkFont>(new SkFont(std::move(face), size, scaleX, skewX, mt, flags)); } -SkFont* SkFont::Create(SkTypeface* face, SkScalar size, MaskType mt, uint32_t flags) { - return SkFont::Create(face, size, 1, 0, mt, flags); +sk_sp<SkFont> SkFont::Make(sk_sp<SkTypeface> face, SkScalar size, MaskType mt, uint32_t flags) { + return SkFont::Make(std::move(face), size, 1, 0, mt, flags); } -SkFont* SkFont::cloneWithSize(SkScalar newSize) const { - return SkFont::Create(this->getTypeface(), newSize, this->getScaleX(), this->getSkewX(), - this->getMaskType(), this->getFlags()); +sk_sp<SkFont> SkFont::makeWithSize(SkScalar newSize) const { + return SkFont::Make(sk_ref_sp(this->getTypeface()), newSize, this->getScaleX(), + this->getSkewX(), this->getMaskType(), this->getFlags()); } /////////////////////////////////////////////////////////////////////////////////////////////////// -SkFont::~SkFont() { - SkSafeUnref(fTypeface); -} - int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding encoding, uint16_t glyphs[], int maxGlyphCount) const { if (0 == byteLength) { @@ -118,7 +110,7 @@ SkScalar SkFont::measureText(const void* text, size_t byteLength, SkTextEncoding #include "SkPaint.h" -SkFont* SkFont::Testing_CreateFromPaint(const SkPaint& paint) { +sk_sp<SkFont> SkFont::Testing_CreateFromPaint(const SkPaint& paint) { uint32_t flags = 0; if (paint.isVerticalText()) { flags |= kVertical_Flag; @@ -150,7 +142,6 @@ SkFont* SkFont::Testing_CreateFromPaint(const SkPaint& paint) { maskType = paint.isLCDRenderText() ? kLCD_MaskType : kA8_MaskType; } - return Create(paint.getTypeface(), - paint.getTextSize(), paint.getTextScaleX(), paint.getTextSkewX(), - maskType, flags); + return Make(sk_ref_sp(paint.getTypeface()), paint.getTextSize(), paint.getTextScaleX(), + paint.getTextSkewX(), maskType, flags); } |