Revert "move onto new factories for SkMatrix"
This reverts commit 046c2b7d90ba3be4eba95d7a6d3948142e9f1ae5.
Reason for revert: need to update/guard flutter
Original change's description:
> move onto new factories for SkMatrix
>
> Just rename, no functional changes expected.
>
> Change-Id: Id77ab1cf6b1cab35087a7c56000750912cf47383
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/290831
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
TBR=fmalita@chromium.org,reed@google.com
Change-Id: Ic74f177128913374b8c60b4df88f04cf72fbacb3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291359
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/docs/examples/ChromeMDRefreshTab.cpp b/docs/examples/ChromeMDRefreshTab.cpp
index 71e6d51..5b31a00 100644
--- a/docs/examples/ChromeMDRefreshTab.cpp
+++ b/docs/examples/ChromeMDRefreshTab.cpp
@@ -62,8 +62,7 @@
SkPathDirection::kCCW, right, bottom - 1);
path.close();
- if (unscale_at_end && (scale != 1)) path.transform(SkMatrix::Scale(1.f / scale,
- 1.f / scale));
+ if (unscale_at_end && (scale != 1)) path.transform(SkMatrix::MakeScale(1.f / scale));
return path;
}
@@ -143,12 +142,12 @@
p.setStyle(SkPaint::kStroke_Style);
p.setStrokeWidth(1);
SkPath path = GetInteriorPath(1.f, SkISize::Make(250, 36), 16);
- path.transform(SkMatrix::Translate(0, 30));
+ path.transform(SkMatrix::MakeTrans(0, 30));
canvas->drawPath(path, p);
p.setColor(SK_ColorBLUE);
SkPath border_path = GetBorderPath(1.f, false, false, 16, SkISize::Make(250, 36));
- border_path.transform(SkMatrix::Translate(0, 30));
+ border_path.transform(SkMatrix::MakeTrans(0, 30));
canvas->drawPath(border_path, p);
// canvas->drawLine(20, 20, 100, 100, p);
diff --git a/docs/examples/Matrix_MakeScale.cpp b/docs/examples/Matrix_MakeScale.cpp
index 166b8de..0699ce3 100644
--- a/docs/examples/Matrix_MakeScale.cpp
+++ b/docs/examples/Matrix_MakeScale.cpp
@@ -4,7 +4,7 @@
// HASH=7ff17718111df6d6f95381d8a8f1b389
REG_FIDDLE(Matrix_MakeScale, 256, 256, false, 4) {
void draw(SkCanvas* canvas) {
- canvas->concat(SkMatrix::Scale(4, 3));
+ canvas->concat(SkMatrix::MakeScale(4, 3));
canvas->drawBitmap(source, 0, 0);
}
} // END FIDDLE
diff --git a/docs/examples/Matrix_MakeScale_2.cpp b/docs/examples/Matrix_MakeScale_2.cpp
index 8fbdcd1..5c03f0c 100644
--- a/docs/examples/Matrix_MakeScale_2.cpp
+++ b/docs/examples/Matrix_MakeScale_2.cpp
@@ -4,7 +4,7 @@
// HASH=2956aeb50fa862cdb13995e1e56a4bc8
REG_FIDDLE(Matrix_MakeScale_2, 256, 256, false, 4) {
void draw(SkCanvas* canvas) {
- canvas->concat(SkMatrix::Scale(4, 4));
+ canvas->concat(SkMatrix::MakeScale(4));
canvas->drawBitmap(source, 0, 0);
}
} // END FIDDLE
diff --git a/docs/examples/Matrix_MakeTrans.cpp b/docs/examples/Matrix_MakeTrans.cpp
index 93896da..90f845f 100644
--- a/docs/examples/Matrix_MakeTrans.cpp
+++ b/docs/examples/Matrix_MakeTrans.cpp
@@ -4,7 +4,7 @@
// HASH=b2479df0d9cf296ff64ac31e36684557
REG_FIDDLE(Matrix_MakeTrans, 256, 256, false, 4) {
void draw(SkCanvas* canvas) {
- SkMatrix matrix = SkMatrix::Translate(64, 48);
+ SkMatrix matrix = SkMatrix::MakeTrans(64, 48);
for (int i = 0; i < 4; ++i) {
canvas->drawBitmap(source, 0, 0);
canvas->concat(matrix);
diff --git a/docs/examples/Matrix_decomposeScale.cpp b/docs/examples/Matrix_decomposeScale.cpp
index 077fc25..4309850 100644
--- a/docs/examples/Matrix_decomposeScale.cpp
+++ b/docs/examples/Matrix_decomposeScale.cpp
@@ -15,7 +15,7 @@
SkDebugf("success: %s ", success ? "true" : "false");
SkDebugf("scale: %g, %g\n", scale.width(), scale.height());
remaining.dump();
- SkMatrix scaleMatrix = SkMatrix::Scale(scale.width(), scale.height());
+ SkMatrix scaleMatrix = SkMatrix::MakeScale(scale.width(), scale.height());
SkMatrix combined = SkMatrix::Concat(scaleMatrix, remaining);
combined.dump();
}
diff --git a/docs/examples/Matrix_isFinite.cpp b/docs/examples/Matrix_isFinite.cpp
index 763c7f6..5759ac2 100644
--- a/docs/examples/Matrix_isFinite.cpp
+++ b/docs/examples/Matrix_isFinite.cpp
@@ -4,7 +4,7 @@
// HASH=bc6c6f6a5df770287120d87f81b922eb
REG_FIDDLE(Matrix_isFinite, 256, 256, true, 0) {
void draw(SkCanvas* canvas) {
- SkMatrix matrix = SkMatrix::Translate(SK_ScalarNaN, 0);
+ SkMatrix matrix = SkMatrix::MakeTrans(SK_ScalarNaN, 0);
matrix.dump();
SkDebugf("matrix is finite: %s\n", matrix.isFinite() ? "true" : "false");
SkDebugf("matrix %c= matrix\n", matrix == matrix ? '=' : '!');
diff --git a/docs/examples/Paint_getFillPath.cpp b/docs/examples/Paint_getFillPath.cpp
index 64b630e..a52e3f2 100644
--- a/docs/examples/Paint_getFillPath.cpp
+++ b/docs/examples/Paint_getFillPath.cpp
@@ -14,7 +14,7 @@
SkPath fillPath;
SkPaint outlinePaint(strokePaint);
outlinePaint.setStrokeWidth(2);
- SkMatrix scale = SkMatrix::Scale(300, 300);
+ SkMatrix scale = SkMatrix::MakeScale(300, 300);
for (SkScalar precision : { 0.01f, .1f, 1.f, 10.f, 100.f } ) {
strokePaint.getFillPath(strokePath, &fillPath, nullptr, precision);
fillPath.transform(scale);
diff --git a/docs/examples/blur_alpha_img.cpp b/docs/examples/blur_alpha_img.cpp
index 2d00ace..880f018 100644
--- a/docs/examples/blur_alpha_img.cpp
+++ b/docs/examples/blur_alpha_img.cpp
@@ -13,7 +13,7 @@
path.lineTo(pts[i] * scale, pts[i + 1] * scale);
}
path.close();
- SkMatrix matrix = SkMatrix::Scale(4 * scale, 4 * scale);
+ SkMatrix matrix = SkMatrix::MakeScale(4 * scale);
SkPaint paint;
paint.setPathEffect(SkPath2DPathEffect::Make(matrix, path));
paint.setAntiAlias(true);
diff --git a/docs/examples/checker_board.cpp b/docs/examples/checker_board.cpp
index 95dafc4..424ce4f 100644
--- a/docs/examples/checker_board.cpp
+++ b/docs/examples/checker_board.cpp
@@ -8,7 +8,7 @@
SkScalar scale = 10.0f;
SkPath path;
path.addRect(0, 0, scale, scale);
- SkMatrix matrix = SkMatrix::Scale(2 * scale, scale);
+ SkMatrix matrix = SkMatrix::MakeScale(2 * scale, scale);
matrix.preSkew(0.5f, 0);
SkPaint paint;
paint.setPathEffect(SkPath2DPathEffect::Make(matrix, path));
diff --git a/docs/examples/flag_us_1792.cpp b/docs/examples/flag_us_1792.cpp
index a99a661..bb258ee 100644
--- a/docs/examples/flag_us_1792.cpp
+++ b/docs/examples/flag_us_1792.cpp
@@ -17,7 +17,7 @@
SkPath star;
SkParsePath::FromSVGString("M 0 -150 L 88 121 L -143 -46 L 143 -46 L -88 121 Z", &star);
for (int i = 0; i < 13; ++i) {
- SkMatrix matrix = SkMatrix::Translate(1482, 1050);
+ SkMatrix matrix = SkMatrix::MakeTrans(1482, 1050);
matrix.preRotate((360.0 / 13) * i);
matrix.preTranslate(0, -785);
SkAutoCanvasRestore autoCanvasRestore(canvas, true);
diff --git a/docs/examples/skpaint_path_2d_path_effect.cpp b/docs/examples/skpaint_path_2d_path_effect.cpp
index 48adaba..de2bb9a 100644
--- a/docs/examples/skpaint_path_2d_path_effect.cpp
+++ b/docs/examples/skpaint_path_2d_path_effect.cpp
@@ -12,7 +12,7 @@
path.lineTo(pts[i] * scale, pts[i + 1] * scale);
}
path.close();
- SkMatrix matrix = SkMatrix::Scale(4 * scale, 4 * scale);
+ SkMatrix matrix = SkMatrix::MakeScale(4 * scale);
SkPaint paint;
paint.setPathEffect(SkPath2DPathEffect::Make(matrix, path));
paint.setAntiAlias(true);