diff options
author | 2016-09-15 10:57:38 -0700 | |
---|---|---|
committer | 2016-09-15 10:57:39 -0700 | |
commit | 606add3dfb2f6d1dc3ee4921876e7c9fa01643f9 (patch) | |
tree | f358bd464a80b6739601ef2c653ce78c532f3a7c /src/ports/SkFontMgr_android.cpp | |
parent | a846c7223c531a634a549e7e6ed7d28eeec95bef (diff) |
Revert of SkFontData to use smart pointers. (patchset #3 id:40001 of https://codereview.chromium.org/2339273002/ )
Reason for revert:
Killing Mac
Original issue's description:
> SkFontData to use smart pointers.
>
> The SkFontData type is not exposed externally, so any method which uses
> it can be updated to use smart pointers without affecting external
> users. Updating this first will make updating the public API much
> easier.
>
> This also updates SkStreamAsset* SkStream::NewFromFile(const char*) to
> std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char*). It
> appears that no one outside Skia is currently using SkStream::NewfromFile
> so this is a good time to update it as well.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339273002
>
> Committed: https://skia.googlesource.com/skia/+/d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c
TBR=mtklein@chromium.org,halcanary@google.com,mtklein@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2343933002
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
-rw-r--r-- | src/ports/SkFontMgr_android.cpp | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index 3a84ecad8b..8a1916a59b 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -15,7 +15,6 @@ #include "SkFontMgr_android.h" #include "SkFontMgr_android_parser.h" #include "SkFontStyle.h" -#include "SkMakeUnique.h" #include "SkOSFile.h" #include "SkPaint.h" #include "SkRefCnt.h" @@ -74,12 +73,12 @@ public: } } - std::unique_ptr<SkStreamAsset> makeStream() const { + SkStreamAsset* createStream() const { if (fFile) { sk_sp<SkData> data(SkData::MakeFromFILE(fFile)); - return data ? skstd::make_unique<SkMemoryStream>(std::move(data)) : nullptr; + return data ? new SkMemoryStream(std::move(data)) : nullptr; } - return SkStream::MakeFromFile(fPathName.c_str()); + return SkStream::NewFromFile(fPathName.c_str()); } virtual void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override { @@ -91,11 +90,10 @@ public: } SkStreamAsset* onOpenStream(int* ttcIndex) const override { *ttcIndex = fIndex; - return this->makeStream().release(); + return this->createStream(); } - std::unique_ptr<SkFontData> onMakeFontData() const override { - return skstd::make_unique<SkFontData>(this->makeStream(), fIndex, - fAxes.begin(), fAxes.count()); + SkFontData* onCreateFontData() const override { + return new SkFontData(this->createStream(), fIndex, fAxes.begin(), fAxes.count()); } const SkString fPathName; @@ -110,12 +108,12 @@ public: class SkTypeface_AndroidStream : public SkTypeface_Android { public: - SkTypeface_AndroidStream(std::unique_ptr<SkFontData> data, + SkTypeface_AndroidStream(SkFontData* data, const SkFontStyle& style, bool isFixedPitch, const SkString& familyName) : INHERITED(style, isFixedPitch, familyName) - , fData(std::move(data)) + , fData(data) { } virtual void onGetFontDescriptor(SkFontDescriptor* desc, @@ -128,15 +126,15 @@ public: SkStreamAsset* onOpenStream(int* ttcIndex) const override { *ttcIndex = fData->getIndex(); - return fData->getStream()->duplicate(); + return fData->duplicateStream(); } - std::unique_ptr<SkFontData> onMakeFontData() const override { - return skstd::make_unique<SkFontData>(*fData); + SkFontData* onCreateFontData() const override { + return new SkFontData(*fData.get()); } private: - const std::unique_ptr<const SkFontData> fData; + const SkAutoTDelete<const SkFontData> fData; typedef SkTypeface_Android INHERITED; }; @@ -157,8 +155,8 @@ public: SkString pathName(family.fBasePath); pathName.append(fontFile.fFileName); - std::unique_ptr<SkStreamAsset> stream = SkStream::MakeFromFile(pathName.c_str()); - if (!stream) { + SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(pathName.c_str())); + if (!stream.get()) { SkDEBUGF(("Requested font file %s does not exist or cannot be opened.\n", pathName.c_str())); continue; @@ -412,31 +410,31 @@ protected: } SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override { - std::unique_ptr<SkStreamAsset> stream = SkStream::MakeFromFile(path); + SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path)); return stream.get() ? this->createFromStream(stream.release(), ttcIndex) : nullptr; } SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override { - std::unique_ptr<SkStreamAsset> stream(bareStream); + SkAutoTDelete<SkStreamAsset> stream(bareStream); bool isFixedPitch; SkFontStyle style; SkString name; - if (!fScanner.scanFont(stream.get(), ttcIndex, &name, &style, &isFixedPitch, nullptr)) { + if (!fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, nullptr)) { return nullptr; } - auto data = skstd::make_unique<SkFontData>(std::move(stream), ttcIndex, nullptr, 0); - return new SkTypeface_AndroidStream(std::move(data), style, isFixedPitch, name); + SkFontData* data(new SkFontData(stream.release(), ttcIndex, nullptr, 0)); + return new SkTypeface_AndroidStream(data, style, isFixedPitch, name); } SkTypeface* onCreateFromStream(SkStreamAsset* s, const FontParameters& params) const override { using Scanner = SkTypeface_FreeType::Scanner; - std::unique_ptr<SkStreamAsset> stream(s); + SkAutoTDelete<SkStreamAsset> stream(s); bool isFixedPitch; SkFontStyle style; SkString name; Scanner::AxisDefinitions axisDefinitions; - if (!fScanner.scanFont(stream.get(), params.getCollectionIndex(), - &name, &style, &isFixedPitch, &axisDefinitions)) + if (!fScanner.scanFont(stream, params.getCollectionIndex(), &name, &style, &isFixedPitch, + &axisDefinitions)) { return nullptr; } @@ -446,12 +444,12 @@ protected: SkAutoSTMalloc<4, SkFixed> axisValues(axisDefinitions.count()); Scanner::computeAxisValues(axisDefinitions, paramAxes, paramAxisCount, axisValues, name); - auto data = skstd::make_unique<SkFontData>(std::move(stream), params.getCollectionIndex(), - axisValues.get(), axisDefinitions.count()); - return new SkTypeface_AndroidStream(std::move(data), style, isFixedPitch, name); + SkFontData* data(new SkFontData(stream.release(), params.getCollectionIndex(), + axisValues.get(), axisDefinitions.count())); + return new SkTypeface_AndroidStream(data, style, isFixedPitch, name); } - SkTypeface* onCreateFromFontData(std::unique_ptr<SkFontData> data) const override { + SkTypeface* onCreateFromFontData(SkFontData* data) const override { SkStreamAsset* stream(data->getStream()); bool isFixedPitch; SkFontStyle style; @@ -459,7 +457,7 @@ protected: if (!fScanner.scanFont(stream, data->getIndex(), &name, &style, &isFixedPitch, nullptr)) { return nullptr; } - return new SkTypeface_AndroidStream(std::move(data), style, isFixedPitch, name); + return new SkTypeface_AndroidStream(data, style, isFixedPitch, name); } SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override { |