SkSize can be aggregate-initialized
Previosly, SkSize had a base class, which prevented it.
Also removes unused SkISize::clampNegToZero() and
SkSize::clampNegToZero().
Change-Id: I7b93b42f6f6381c66e294bbedee99ad53c6c3436
Reviewed-on: https://skia-review.googlesource.com/13187
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 6db8f26..e8c33a4 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -243,10 +243,10 @@
SkISize BRDSrc::size() const {
std::unique_ptr<SkBitmapRegionDecoder> brd(create_brd(fPath));
if (brd) {
- return SkISize::Make(SkTMax(1, brd->width() / (int) fSampleSize),
- SkTMax(1, brd->height() / (int) fSampleSize));
+ return {SkTMax(1, brd->width() / (int)fSampleSize),
+ SkTMax(1, brd->height() / (int)fSampleSize)};
}
- return SkISize::Make(0, 0);
+ return {0, 0};
}
static SkString get_scaled_name(const Path& path, float scale) {
@@ -751,7 +751,7 @@
sk_sp<SkData> encoded(SkData::MakeFromFileName(fPath.c_str()));
std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(encoded));
if (nullptr == codec) {
- return SkISize::Make(0, 0);
+ return {0, 0};
}
auto imageSize = codec->getScaledDimensions(fScale);
@@ -857,7 +857,7 @@
sk_sp<SkData> encoded(SkData::MakeFromFileName(fPath.c_str()));
std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::NewFromData(encoded));
if (nullptr == codec) {
- return SkISize::Make(0, 0);
+ return {0, 0};
}
return codec->getSampledDimensions(fSampleSize);
}
@@ -976,7 +976,7 @@
sk_sp<SkData> encoded(SkData::MakeFromFileName(fPath.c_str()));
std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(encoded));
if (nullptr == codec) {
- return SkISize::Make(0, 0);
+ return {0, 0};
}
return codec->getInfo().dimensions();
}
@@ -1080,9 +1080,9 @@
sk_sp<SkData> encoded(SkData::MakeFromFileName(fPath.c_str()));
std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(encoded));
if (nullptr == codec) {
- return SkISize::Make(0, 0);
+ return {0, 0};
}
- return SkISize::Make(codec->getInfo().width(), codec->getInfo().height());
+ return {codec->getInfo().width(), codec->getInfo().height()};
}
Name ColorCodecSrc::name() const {
@@ -1114,15 +1114,15 @@
SkISize SKPSrc::size() const {
std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(fPath.c_str());
if (!stream) {
- return SkISize::Make(0,0);
+ return {0, 0};
}
SkPictInfo info;
if (!SkPicture::InternalOnly_StreamIsSKP(stream.get(), &info)) {
- return SkISize::Make(0,0);
+ return {0, 0};
}
SkRect viewport = kSKPViewport;
if (!viewport.intersect(info.fCullRect)) {
- return SkISize::Make(0,0);
+ return {0, 0};
}
return viewport.roundOut().size();
}
@@ -1132,10 +1132,10 @@
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#if defined(SK_XML)
// Used when the image doesn't have an intrinsic size.
-static const SkSize kDefaultSVGSize = SkSize::Make(1000, 1000);
+static const SkSize kDefaultSVGSize = {1000, 1000};
// Used to force-scale tiny fixed-size images.
-static const SkSize kMinimumSVGSize = SkSize::Make(128, 128);
+static const SkSize kMinimumSVGSize = {128, 128};
SVGSrc::SVGSrc(Path path)
: fName(SkOSPath::Basename(path.c_str()))
@@ -1174,11 +1174,11 @@
SkISize SVGSrc::size() const {
if (!fDom) {
- return SkISize::Make(0, 0);
+ return {0, 0};
}
- return SkSize::Make(fDom->containerSize().width() * fScale,
- fDom->containerSize().height() * fScale).toRound();
+ return SkSize{fDom->containerSize().width() * fScale, fDom->containerSize().height() * fScale}
+ .toRound();
}
Name SVGSrc::name() const { return fName; }
@@ -1207,7 +1207,7 @@
SkISize MSKPSrc::size() const { return this->size(0); }
SkISize MSKPSrc::size(int i) const {
- return i >= 0 && i < fPages.count() ? fPages[i].fSize.toCeil() : SkISize::Make(0, 0);
+ return i >= 0 && i < fPages.count() ? fPages[i].fSize.toCeil() : SkISize{0, 0};
}
Error MSKPSrc::draw(SkCanvas* c) const { return this->draw(0, c); }
@@ -1522,7 +1522,7 @@
SkRect bounds = SkRect::MakeIWH(srcW, srcH);
matrix->mapRect(&bounds);
matrix->postTranslate(-bounds.x(), -bounds.y());
- return SkISize::Make(SkScalarRoundToInt(bounds.width()), SkScalarRoundToInt(bounds.height()));
+ return {SkScalarRoundToInt(bounds.width()), SkScalarRoundToInt(bounds.height())};
}
ViaMatrix::ViaMatrix(SkMatrix matrix, Sink* sink) : Via(sink), fMatrix(matrix) {}