Revert "Revert "move onto new factories for SkMatrix""
This reverts commit c80ee456adf664c4a62fa2ccaeaf157c723ed656.
fix: update flutter's gn file to add guard
Change-Id: Iac5171c8475d9a862d06255dab1c6f38f10de2f2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291361
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/bench/DashBench.cpp b/bench/DashBench.cpp
index 99ca576..df014a8 100644
--- a/bench/DashBench.cpp
+++ b/bench/DashBench.cpp
@@ -151,7 +151,7 @@
static void make_poly(SkPath* path) {
make_unit_star(path, 9);
- const SkMatrix matrix = SkMatrix::MakeScale(SkIntToScalar(100), SkIntToScalar(100));
+ const SkMatrix matrix = SkMatrix::Scale(100, 100);
path->transform(matrix);
}
diff --git a/bench/DrawBitmapAABench.cpp b/bench/DrawBitmapAABench.cpp
index 52a92f7..e57ecd9 100644
--- a/bench/DrawBitmapAABench.cpp
+++ b/bench/DrawBitmapAABench.cpp
@@ -54,11 +54,11 @@
typedef Benchmark INHERITED;
};
-DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::MakeScale(1), "ident"); )
+DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::I(), "ident"); )
-DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::MakeScale(1.17f), "scale"); )
+DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::Scale(1.17f, 1.17f), "scale"); )
-DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::MakeTrans(17.5f, 17.5f), "translate"); )
+DEF_BENCH( return new DrawBitmapAABench(false, SkMatrix::Translate(17.5f, 17.5f), "translate"); )
DEF_BENCH(
SkMatrix m;
@@ -67,11 +67,11 @@
return new DrawBitmapAABench(false, m, "rotate");
)
-DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::MakeScale(1), "ident"); )
+DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::I(), "ident"); )
-DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::MakeScale(1.17f), "scale"); )
+DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::Scale(1.17f, 1.17f), "scale"); )
-DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::MakeTrans(17.5f, 17.5f), "translate"); )
+DEF_BENCH( return new DrawBitmapAABench(true, SkMatrix::Translate(17.5f, 17.5f), "translate"); )
DEF_BENCH(
SkMatrix m;
diff --git a/bench/HairlinePathBench.cpp b/bench/HairlinePathBench.cpp
index d57f616..5e29a13 100644
--- a/bench/HairlinePathBench.cpp
+++ b/bench/HairlinePathBench.cpp
@@ -60,7 +60,7 @@
SkPath path;
this->makePath(&path);
if (fFlags & kBig_Flag) {
- const SkMatrix m = SkMatrix::MakeScale(SkIntToScalar(3), SkIntToScalar(3));
+ const SkMatrix m = SkMatrix::Scale(3, 3);
path.transform(m);
}
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index 7248d01..c2f5ea0 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -266,7 +266,7 @@
///////////////////////////////////////////////////////////////////////////////
-static SkMatrix make_trans() { return SkMatrix::MakeTrans(2, 3); }
+static SkMatrix make_trans() { return SkMatrix::Translate(2, 3); }
static SkMatrix make_scale() { SkMatrix m(make_trans()); m.postScale(1.5f, 0.5f); return m; }
static SkMatrix make_afine() { SkMatrix m(make_trans()); m.postRotate(15); return m; }
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp
index e78080b..93824bc 100644
--- a/bench/PathBench.cpp
+++ b/bench/PathBench.cpp
@@ -58,7 +58,7 @@
SkPath path;
this->makePath(&path);
if (fFlags & kBig_Flag) {
- const SkMatrix m = SkMatrix::MakeScale(SkIntToScalar(10), SkIntToScalar(10));
+ const SkMatrix m = SkMatrix::Scale(10, 10);
path.transform(m);
}
diff --git a/bench/QuickRejectBench.cpp b/bench/QuickRejectBench.cpp
index daad4d4..86f97c5 100644
--- a/bench/QuickRejectBench.cpp
+++ b/bench/QuickRejectBench.cpp
@@ -53,7 +53,7 @@
void onDraw(int loops, SkCanvas* canvas) override {
while (loops --> 0) {
- canvas->setMatrix(SkMatrix::MakeScale(3.0f));
+ canvas->setMatrix(SkMatrix::Scale(3, 3));
canvas->concat(fMatrix);
}
}
diff --git a/bench/SKPAnimationBench.cpp b/bench/SKPAnimationBench.cpp
index 8cb9d8d..2bd3efb 100644
--- a/bench/SKPAnimationBench.cpp
+++ b/bench/SKPAnimationBench.cpp
@@ -28,7 +28,7 @@
void SKPAnimationBench::drawPicture() {
for (int j = 0; j < this->tileRects().count(); ++j) {
- SkMatrix trans = SkMatrix::MakeTrans(-1.f * this->tileRects()[j].fLeft,
+ SkMatrix trans = SkMatrix::Translate(-1.f * this->tileRects()[j].fLeft,
-1.f * this->tileRects()[j].fTop);
fAnimation->preConcatFrameMatrix(fAnimationTime.nextRangeF(0, 1000), fDevBounds, &trans);
this->surfaces()[j]->getCanvas()->drawPicture(this->picture(), &trans, nullptr);
diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp
index 802b20b..f8a480e 100644
--- a/bench/SKPBench.cpp
+++ b/bench/SKPBench.cpp
@@ -129,7 +129,7 @@
void SKPBench::drawPicture() {
for (int j = 0; j < fTileRects.count(); ++j) {
- const SkMatrix trans = SkMatrix::MakeTrans(-fTileRects[j].fLeft / fScale,
+ const SkMatrix trans = SkMatrix::Translate(-fTileRects[j].fLeft / fScale,
-fTileRects[j].fTop / fScale);
fSurfaces[j]->getCanvas()->drawPicture(fPic.get(), &trans, nullptr);
}
diff --git a/bench/TessellatePathBench.cpp b/bench/TessellatePathBench.cpp
index dc0daf7..610eadc 100644
--- a/bench/TessellatePathBench.cpp
+++ b/bench/TessellatePathBench.cpp
@@ -194,7 +194,7 @@
);
DEF_BENCH(
return new GrTessellatePathOp::TestingOnly_Benchmark::WangsFormulaBench(
- "_scale", SkMatrix::MakeScale(1.1f, 0.9f));
+ "_scale", SkMatrix::Scale(1.1f, 0.9f));
);
DEF_BENCH(
return new GrTessellatePathOp::TestingOnly_Benchmark::WangsFormulaBench(