diff options
| author |  bungeman <bungeman@google.com> | 2016-08-02 14:40:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-02 14:40:46 -0700 |
| commit | 38d909ec2875f79952de08f36adfaac5680d2c53 (patch) | |
| tree | a11067146b42f3faa8531d6ef912f7246bbde1f2 /tools/Resources.cpp | |
| parent | ada5a44f3bdac10a8a0c53b34f5add7aea9fdbb0 (diff) | |
Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.
This moves Skia code off of SK_SUPPORT_LEGACY_DATA_FACTORIES.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206633004
Review-Url: https://codereview.chromium.org/2206633004
Diffstat (limited to 'tools/Resources.cpp')
| -rw-r--r-- | tools/Resources.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Resources.cpp b/tools/Resources.cpp index 6d3054ab33..899f5d2bc4 100644 --- a/tools/Resources.cpp +++ b/tools/Resources.cpp @@ -27,14 +27,14 @@ void SetResourcePath(const char* resource) { bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) { SkString resourcePath = GetResourcePath(resource); - SkAutoTUnref<SkData> resourceData(SkData::NewFromFileName(resourcePath.c_str())); - SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData)); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(resourcePath.c_str())); + SkAutoTDelete<SkImageGenerator> gen(SkImageGenerator::NewFromEncoded(resourceData.get())); return gen && gen->tryGenerateBitmap(dst); } sk_sp<SkImage> GetResourceAsImage(const char* resource) { SkString path = GetResourcePath(resource); - sk_sp<SkData> resourceData(SkData::NewFromFileName(path.c_str())); + sk_sp<SkData> resourceData(SkData::MakeFromFileName(path.c_str())); return SkImage::MakeFromEncoded(resourceData); } |