606add3dfb
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
59 lines
1.8 KiB
C++
59 lines
1.8 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Resources.h"
|
|
#include "SkBitmap.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkData.h"
|
|
#include "SkImage.h"
|
|
#include "SkImageGenerator.h"
|
|
#include "SkOSFile.h"
|
|
#include "SkStream.h"
|
|
#include "SkTypeface.h"
|
|
|
|
DEFINE_string2(resourcePath, i, "resources", "Directory with test resources: images, fonts, etc.");
|
|
|
|
SkString GetResourcePath(const char* resource) {
|
|
return SkOSPath::Join(FLAGS_resourcePath[0], resource);
|
|
}
|
|
|
|
void SetResourcePath(const char* resource) {
|
|
FLAGS_resourcePath.set(0, resource);
|
|
}
|
|
|
|
bool GetResourceAsBitmap(const char* resource, SkBitmap* dst) {
|
|
SkString resourcePath = GetResourcePath(resource);
|
|
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::MakeFromFileName(path.c_str()));
|
|
return SkImage::MakeFromEncoded(resourceData);
|
|
}
|
|
|
|
SkStreamAsset* GetResourceAsStream(const char* resource) {
|
|
SkString resourcePath = GetResourcePath(resource);
|
|
SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(resourcePath.c_str()));
|
|
if (stream->isValid()) {
|
|
return stream.release();
|
|
} else {
|
|
SkDebugf("Resource %s not found.\n", resource);
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
sk_sp<SkTypeface> MakeResourceAsTypeface(const char* resource) {
|
|
SkAutoTDelete<SkStreamAsset> stream(GetResourceAsStream(resource));
|
|
if (!stream) {
|
|
return nullptr;
|
|
}
|
|
return SkTypeface::MakeFromStream(stream.release());
|
|
}
|