Fix return type of Benchmark::getSize
This was confusing, for no good reason.
Change-Id: Ia0a87ab1dba7f4d42a8b2cba0d0d5c69914f7e39
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/712937
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/bench/Benchmark.cpp b/bench/Benchmark.cpp
index eba1750..0ac1dec 100644
--- a/bench/Benchmark.cpp
+++ b/bench/Benchmark.cpp
@@ -23,7 +23,7 @@
return this->onGetUniqueName();
}
-SkIPoint Benchmark::getSize() {
+SkISize Benchmark::getSize() {
return this->onGetSize();
}
@@ -56,6 +56,6 @@
paint->setAntiAlias(true);
}
-SkIPoint Benchmark::onGetSize() {
- return SkIPoint::Make(640, 480);
+SkISize Benchmark::onGetSize() {
+ return SkISize::Make(640, 480);
}
diff --git a/bench/Benchmark.h b/bench/Benchmark.h
index 8b05de7..51048be 100644
--- a/bench/Benchmark.h
+++ b/bench/Benchmark.h
@@ -8,8 +8,8 @@
#ifndef Benchmark_DEFINED
#define Benchmark_DEFINED
-#include "include/core/SkPoint.h"
#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/private/base/SkTArray.h"
#include "tools/Registry.h"
@@ -39,7 +39,7 @@
const char* getName();
const char* getUniqueName();
- SkIPoint getSize();
+ SkISize getSize();
enum Backend {
kNonRendering_Backend,
@@ -106,7 +106,7 @@
// for (int i = 0; i < loops; i++) { <work here> }
virtual void onDraw(int loops, SkCanvas*) = 0;
- virtual SkIPoint onGetSize();
+ virtual SkISize onGetSize();
private:
int fUnits = 1;
diff --git a/bench/BigPathBench.cpp b/bench/BigPathBench.cpp
index b553a19..77cdcf3 100644
--- a/bench/BigPathBench.cpp
+++ b/bench/BigPathBench.cpp
@@ -39,8 +39,8 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
- return SkIPoint::Make(640, 100);
+ SkISize onGetSize() override {
+ return SkISize::Make(640, 100);
}
void onDelayedSetup() override { fPath = BenchUtils::make_big_path(); }
diff --git a/bench/BulkRectBench.cpp b/bench/BulkRectBench.cpp
index c37da56..d6c3e56 100644
--- a/bench/BulkRectBench.cpp
+++ b/bench/BulkRectBench.cpp
@@ -262,7 +262,7 @@
}
}
- SkIPoint onGetSize() override {
+ SkISize onGetSize() override {
return { kWidth, kHeight };
}
diff --git a/bench/CanvasSaveRestoreBench.cpp b/bench/CanvasSaveRestoreBench.cpp
index 3874987..658d942 100644
--- a/bench/CanvasSaveRestoreBench.cpp
+++ b/bench/CanvasSaveRestoreBench.cpp
@@ -17,7 +17,7 @@
protected:
const char* onGetName() override { return fName.c_str(); }
bool isSuitableFor(Backend backend) override { return backend == kRaster_Backend; }
- SkIPoint onGetSize() override { return { 1, 1 }; }
+ SkISize onGetSize() override { return { 1, 1 }; }
void onDraw(int loops, SkCanvas* canvas) override {
SkM44 m = SkM44::Rotate({0, 0, 1}, 1);
diff --git a/bench/ChromeBench.cpp b/bench/ChromeBench.cpp
index 88e6311..b2d839a 100644
--- a/bench/ChromeBench.cpp
+++ b/bench/ChromeBench.cpp
@@ -473,7 +473,7 @@
}
}
}
- SkIPoint onGetSize() override { return SkIPoint::Make(W, H); }
+ SkISize onGetSize() override { return SkISize::Make(W, H); }
void setRectangle(SkRect& current, int i) {
current.setWH(SkIntToScalar(gmailScrollingRectSpec[i*3+1]),
diff --git a/bench/ClipStrategyBench.cpp b/bench/ClipStrategyBench.cpp
index 1622883..12db0d6 100644
--- a/bench/ClipStrategyBench.cpp
+++ b/bench/ClipStrategyBench.cpp
@@ -65,7 +65,7 @@
private:
template <typename Func>
void forEachClipCircle(Func&& func) {
- auto q = static_cast<float>(this->getSize().x()) / (fCount + 1);
+ auto q = static_cast<float>(this->getSize().width()) / (fCount + 1);
for (size_t i = 1; i <= fCount; ++i) {
auto x = q * i;
func(x, x, q / 2);
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index 6b0bb72..cb9a210 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -143,7 +143,7 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
+ SkISize onGetSize() override {
return { 256, 256 };
}
diff --git a/bench/CompositingImagesBench.cpp b/bench/CompositingImagesBench.cpp
index 4fcabc8..11e6b19 100644
--- a/bench/CompositingImagesBench.cpp
+++ b/bench/CompositingImagesBench.cpp
@@ -248,11 +248,11 @@
return m;
}
- SkIPoint onGetSize() override {
+ SkISize onGetSize() override {
SkRect size = SkRect::MakeWH(1.25f * fTileSize.fWidth * fTileGridSize.fWidth,
1.25f * fTileSize.fHeight * fTileGridSize.fHeight);
this->getTransform().mapRect(&size);
- return SkIPoint::Make(SkScalarCeilToInt(size.width()), SkScalarCeilToInt(size.height()));
+ return SkISize::Make(SkScalarCeilToInt(size.width()), SkScalarCeilToInt(size.height()));
}
unsigned getEdgeFlags(int x, int y) const {
diff --git a/bench/GMBench.cpp b/bench/GMBench.cpp
index 02e7bcb..9f1228c 100644
--- a/bench/GMBench.cpp
+++ b/bench/GMBench.cpp
@@ -51,7 +51,6 @@
}
}
-SkIPoint GMBench::onGetSize() {
- SkISize size = fGM->getISize();
- return SkIPoint::Make(size.fWidth, size.fHeight);
+SkISize GMBench::onGetSize() {
+ return fGM->getISize();
}
diff --git a/bench/GMBench.h b/bench/GMBench.h
index c9fb766..88f120a 100644
--- a/bench/GMBench.h
+++ b/bench/GMBench.h
@@ -28,7 +28,7 @@
void onPerCanvasPreDraw(SkCanvas*) override;
void onPerCanvasPostDraw(SkCanvas*) override;
void onDraw(int loops, SkCanvas*) override;
- SkIPoint onGetSize() override;
+ SkISize onGetSize() override;
private:
std::unique_ptr<skiagm::GM> fGM;
diff --git a/bench/GradientBench.cpp b/bench/GradientBench.cpp
index b453dbf..87ce4b0 100644
--- a/bench/GradientBench.cpp
+++ b/bench/GradientBench.cpp
@@ -217,8 +217,8 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
- return SkIPoint::Make(kSize, kSize);
+ SkISize onGetSize() override {
+ return SkISize::Make(kSize, kSize);
}
void onDraw(int loops, SkCanvas* canvas) override {
diff --git a/bench/HardStopGradientBench_ScaleNumColors.cpp b/bench/HardStopGradientBench_ScaleNumColors.cpp
index 66180c5..4f35984 100644
--- a/bench/HardStopGradientBench_ScaleNumColors.cpp
+++ b/bench/HardStopGradientBench_ScaleNumColors.cpp
@@ -30,8 +30,8 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
- return SkIPoint::Make(kSize, kSize);
+ SkISize onGetSize() override {
+ return SkISize::Make(kSize, kSize);
}
/*
diff --git a/bench/HardStopGradientBench_ScaleNumHardStops.cpp b/bench/HardStopGradientBench_ScaleNumHardStops.cpp
index 0cfc26e..273a7b4 100644
--- a/bench/HardStopGradientBench_ScaleNumHardStops.cpp
+++ b/bench/HardStopGradientBench_ScaleNumHardStops.cpp
@@ -33,8 +33,8 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
- return SkIPoint::Make(kSize, kSize);
+ SkISize onGetSize() override {
+ return SkISize::Make(kSize, kSize);
}
void onPreDraw(SkCanvas* canvas) override {
diff --git a/bench/HardStopGradientBench_SpecialHardStops.cpp b/bench/HardStopGradientBench_SpecialHardStops.cpp
index ac6e461..388c09d 100644
--- a/bench/HardStopGradientBench_SpecialHardStops.cpp
+++ b/bench/HardStopGradientBench_SpecialHardStops.cpp
@@ -47,8 +47,8 @@
return fName.c_str();
}
- SkIPoint onGetSize() override {
- return SkIPoint::Make(fW, fH);
+ SkISize onGetSize() override {
+ return SkISize::Make(fW, fH);
}
void onPreDraw(SkCanvas* canvas) override {
diff --git a/bench/ImageCycleBench.cpp b/bench/ImageCycleBench.cpp
index 3e97ad9..eee3e57 100644
--- a/bench/ImageCycleBench.cpp
+++ b/bench/ImageCycleBench.cpp
@@ -82,7 +82,7 @@
}
private:
- SkIPoint onGetSize() override { return {kDeviceSize.fWidth, kDeviceSize.fHeight}; }
+ SkISize onGetSize() override { return {kDeviceSize.fWidth, kDeviceSize.fHeight}; }
inline static constexpr SkISize kImageSize{4, 4};
inline static constexpr SkISize kDeviceSize{64, 64};
diff --git a/bench/MSKPBench.cpp b/bench/MSKPBench.cpp
index 1e7fcda..4c84049 100644
--- a/bench/MSKPBench.cpp
+++ b/bench/MSKPBench.cpp
@@ -34,7 +34,7 @@
const char* MSKPBench::onGetName() { return fName.c_str(); }
-SkIPoint MSKPBench::onGetSize() {
+SkISize MSKPBench::onGetSize() {
auto dims = fPlayer->maxDimensions();
return {dims.width(), dims.height()};
}
diff --git a/bench/MSKPBench.h b/bench/MSKPBench.h
index ca389de..db76c40 100644
--- a/bench/MSKPBench.h
+++ b/bench/MSKPBench.h
@@ -20,7 +20,7 @@
protected:
void onDraw(int loops, SkCanvas*) override;
const char* onGetName() override;
- SkIPoint onGetSize() override;
+ SkISize onGetSize() override;
void onPreDraw(SkCanvas*) override;
void onPostDraw(SkCanvas*) override;
diff --git a/bench/PathTextBench.cpp b/bench/PathTextBench.cpp
index 76f0d54..1fb229a 100644
--- a/bench/PathTextBench.cpp
+++ b/bench/PathTextBench.cpp
@@ -43,7 +43,7 @@
}
return fName.c_str();
}
- SkIPoint onGetSize() override { return SkIPoint::Make(kScreenWidth, kScreenHeight); }
+ SkISize onGetSize() override { return SkISize::Make(kScreenWidth, kScreenHeight); }
void onDelayedSetup() override {
SkFont defaultFont;
diff --git a/bench/PictureNestingBench.cpp b/bench/PictureNestingBench.cpp
index 827e3ed..c3985c2 100644
--- a/bench/PictureNestingBench.cpp
+++ b/bench/PictureNestingBench.cpp
@@ -31,9 +31,9 @@
}
void doDraw(SkCanvas* canvas) {
- SkIPoint canvasSize = onGetSize();
+ SkISize canvasSize = onGetSize();
canvas->save();
- canvas->scale(SkIntToScalar(canvasSize.x()), SkIntToScalar(canvasSize.y()));
+ canvas->scale(SkIntToScalar(canvasSize.width()), SkIntToScalar(canvasSize.height()));
SkDEBUGCODE(int pics = ) this->sierpinsky(canvas, 0, fPaint);
SkASSERT(pics == this->countPics());
@@ -117,12 +117,12 @@
}
void onDraw(int loops, SkCanvas*) override {
- SkIPoint canvasSize = onGetSize();
+ SkISize canvasSize = onGetSize();
SkPictureRecorder recorder;
for (int i = 0; i < loops; i++) {
- SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.x()),
- SkIntToScalar(canvasSize.y()));
+ SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.width()),
+ SkIntToScalar(canvasSize.height()));
this->doDraw(c);
(void)recorder.finishRecordingAsPicture();
}
@@ -141,10 +141,10 @@
void onDelayedSetup() override {
this->INHERITED::onDelayedSetup();
- SkIPoint canvasSize = onGetSize();
+ SkISize canvasSize = onGetSize();
SkPictureRecorder recorder;
- SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.x()),
- SkIntToScalar(canvasSize.y()));
+ SkCanvas* c = recorder.beginRecording(SkIntToScalar(canvasSize.width()),
+ SkIntToScalar(canvasSize.height()));
this->doDraw(c);
fPicture = recorder.finishRecordingAsPicture();
diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp
index 01b2a98..f697017 100644
--- a/bench/PicturePlaybackBench.cpp
+++ b/bench/PicturePlaybackBench.cpp
@@ -40,7 +40,7 @@
}
const char* onGetName() override { return fName.c_str(); }
- SkIPoint onGetSize() override { return SkIPoint::Make(1024,1024); }
+ SkISize onGetSize() override { return SkISize::Make(1024,1024); }
void onDelayedSetup() override {
std::unique_ptr<SkBBHFactory> factory;
diff --git a/bench/RecordingBench.cpp b/bench/RecordingBench.cpp
index 303bf82..b6d8e8c 100644
--- a/bench/RecordingBench.cpp
+++ b/bench/RecordingBench.cpp
@@ -27,9 +27,9 @@
return backend == kNonRendering_Backend;
}
-SkIPoint PictureCentricBench::onGetSize() {
- return SkIPoint::Make(SkScalarCeilToInt(fSrc->cullRect().width()),
- SkScalarCeilToInt(fSrc->cullRect().height()));
+SkISize PictureCentricBench::onGetSize() {
+ return SkISize::Make(SkScalarCeilToInt(fSrc->cullRect().width()),
+ SkScalarCeilToInt(fSrc->cullRect().height()));
}
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -64,8 +64,8 @@
return backend == kNonRendering_Backend;
}
-SkIPoint DeserializePictureBench::onGetSize() {
- return SkIPoint::Make(128, 128);
+SkISize DeserializePictureBench::onGetSize() {
+ return SkISize::Make(128, 128);
}
void DeserializePictureBench::onDraw(int loops, SkCanvas*) {
diff --git a/bench/RecordingBench.h b/bench/RecordingBench.h
index 0fcf07f..d1dfcd5 100644
--- a/bench/RecordingBench.h
+++ b/bench/RecordingBench.h
@@ -18,7 +18,7 @@
protected:
const char* onGetName() override;
bool isSuitableFor(Backend) override;
- SkIPoint onGetSize() override;
+ SkISize onGetSize() override;
protected:
sk_sp<const SkPicture> fSrc;
@@ -47,7 +47,7 @@
protected:
const char* onGetName() override;
bool isSuitableFor(Backend) override;
- SkIPoint onGetSize() override;
+ SkISize onGetSize() override;
void onDraw(int loops, SkCanvas*) override;
private:
diff --git a/bench/RotatedRectBench.cpp b/bench/RotatedRectBench.cpp
index d569fd3..72d5939 100644
--- a/bench/RotatedRectBench.cpp
+++ b/bench/RotatedRectBench.cpp
@@ -88,8 +88,8 @@
paint.setBlendMode(fMode);
SkColor color = start_color(fColorType);
- int w = this->getSize().x();
- int h = this->getSize().y();
+ int w = this->getSize().width();
+ int h = this->getSize().height();
static const SkScalar kRectW = 25.1f;
static const SkScalar kRectH = 25.9f;
diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp
index 2ab24aa..17603ba 100644
--- a/bench/SKPBench.cpp
+++ b/bench/SKPBench.cpp
@@ -107,8 +107,8 @@
return backend != kNonRendering_Backend;
}
-SkIPoint SKPBench::onGetSize() {
- return SkIPoint::Make(fClip.width(), fClip.height());
+SkISize SKPBench::onGetSize() {
+ return SkISize::Make(fClip.width(), fClip.height());
}
void SKPBench::onDraw(int loops, SkCanvas* canvas) {
diff --git a/bench/SKPBench.h b/bench/SKPBench.h
index fe23a1b..939d7c9 100644
--- a/bench/SKPBench.h
+++ b/bench/SKPBench.h
@@ -40,7 +40,7 @@
void onPerCanvasPostDraw(SkCanvas*) override;
bool isSuitableFor(Backend backend) override;
void onDraw(int loops, SkCanvas* canvas) override;
- SkIPoint onGetSize() override;
+ SkISize onGetSize() override;
virtual void drawMPDPicture();
virtual void drawPicture();
diff --git a/bench/ShapesBench.cpp b/bench/ShapesBench.cpp
index d6676c0..b1e6efd 100644
--- a/bench/ShapesBench.cpp
+++ b/bench/ShapesBench.cpp
@@ -132,7 +132,7 @@
return fName.c_str();
}
- SkIPoint onGetSize() override { return SkIPoint::Make(kBenchWidth, kBenchHeight); }
+ SkISize onGetSize() override { return SkISize::Make(kBenchWidth, kBenchHeight); }
void onDelayedSetup() override {
SkScalar w = SkIntToScalar(fShapesSize.width());
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 7f5241a..d793b15 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -704,8 +704,8 @@
return nullptr;
}
- SkImageInfo info = SkImageInfo::Make(bench->getSize().fX, bench->getSize().fY,
- config.color, config.alpha, config.colorSpace);
+ SkImageInfo info =
+ SkImageInfo::Make(bench->getSize(), config.color, config.alpha, config.colorSpace);
Target* target = nullptr;
@@ -1443,7 +1443,8 @@
}
if (!configs.empty()) {
- log.beginBench(bench->getUniqueName(), bench->getSize().fX, bench->getSize().fY);
+ log.beginBench(
+ bench->getUniqueName(), bench->getSize().width(), bench->getSize().height());
bench->delayedSetup();
}
for (int i = 0; i < configs.size(); ++i) {
