aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleAnimator.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-09-15 10:03:27 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-15 10:03:27 -0700
commitd8c2476a8b1e1e1a1771b17e8dd4db8645914f8c (patch)
tree8b274ded4310cbc30791e448d2af7e3a448e4309 /samplecode/SampleAnimator.cpp
parent35b26a457100804b7a782cdff1132d2b65176c35 (diff)
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 Review-Url: https://codereview.chromium.org/2339273002
Diffstat (limited to 'samplecode/SampleAnimator.cpp')
-rw-r--r--samplecode/SampleAnimator.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/samplecode/SampleAnimator.cpp b/samplecode/SampleAnimator.cpp
index d4a4cdd288..a3ec83afe6 100644
--- a/samplecode/SampleAnimator.cpp
+++ b/samplecode/SampleAnimator.cpp
@@ -12,6 +12,8 @@
#include "SkStream.h"
#include "SkDOM.h"
+#include <memory>
+
///////////////////////////////////////////////////////////////////////////////
class SkAnimatorView : public SkView {
@@ -50,8 +52,8 @@ void SkAnimatorView::setURIBase(const char dir[]) {
}
bool SkAnimatorView::decodeFile(const char path[]) {
- SkAutoTDelete<SkStream> is(SkStream::NewFromFile(path));
- return is.get() != nullptr && this->decodeStream(is);
+ std::unique_ptr<SkStream> is = SkStream::MakeFromFile(path);
+ return is && this->decodeStream(is.get());
}
bool SkAnimatorView::decodeMemory(const void* buffer, size_t size) {