Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit ca4d5c8

Browse files
johnstiles-googlejohnstiles-google
authored
Remove SkScalarIsFinite from Flutter Engine. (#52270)
SkScalarIsFinite is deprecated. Use `std::isfinite` instead.
1 parent ca496f8 commit ca4d5c8

File tree

6 files changed

+26
-25
lines changed

6 files changed

+26
-25
lines changed

‎display_list/dl_builder.cc

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,7 @@ void DisplayListBuilder::SaveLayer(const SkRect* bounds,
707707
}
708708

709709
void DisplayListBuilder::Translate(SkScalar tx, SkScalar ty) {
710-
if (SkScalarIsFinite(tx) && SkScalarIsFinite(ty) &&
711-
(tx != 0.0 || ty != 0.0)) {
710+
if (std::isfinite(tx) && std::isfinite(ty) && (tx != 0.0 || ty != 0.0)) {
712711
checkForDeferredSave();
713712
Push<TranslateOp>(0, tx, ty);
714713
tracker_.translate(tx, ty);
@@ -718,8 +717,7 @@ void DisplayListBuilder::Translate(SkScalar tx, SkScalar ty) {
718717
}
719718
}
720719
void DisplayListBuilder::Scale(SkScalar sx, SkScalar sy) {
721-
if (SkScalarIsFinite(sx) && SkScalarIsFinite(sy) &&
722-
(sx != 1.0 || sy != 1.0)) {
720+
if (std::isfinite(sx) && std::isfinite(sy) && (sx != 1.0 || sy != 1.0)) {
723721
checkForDeferredSave();
724722
Push<ScaleOp>(0, sx, sy);
725723
tracker_.scale(sx, sy);
@@ -739,8 +737,7 @@ void DisplayListBuilder::Rotate(SkScalar degrees) {
739737
}
740738
}
741739
void DisplayListBuilder::Skew(SkScalar sx, SkScalar sy) {
742-
if (SkScalarIsFinite(sx) && SkScalarIsFinite(sy) &&
743-
(sx != 0.0 || sy != 0.0)) {
740+
if (std::isfinite(sx) && std::isfinite(sy) && (sx != 0.0 || sy != 0.0)) {
744741
checkForDeferredSave();
745742
Push<SkewOp>(0, sx, sy);
746743
tracker_.skew(sx, sy);
@@ -756,9 +753,9 @@ void DisplayListBuilder::Skew(SkScalar sx, SkScalar sy) {
756753
void DisplayListBuilder::Transform2DAffine(
757754
SkScalar mxx, SkScalar mxy, SkScalar mxt,
758755
SkScalar myx, SkScalar myy, SkScalar myt) {
759-
if (SkScalarsAreFinite(mxx, myx) &&
760-
SkScalarsAreFinite(mxy, myy) &&
761-
SkScalarsAreFinite(mxt, myt)) {
756+
if (std::isfinite(mxx) && std::isfinite(myx) &&
757+
std::isfinite(mxy) && std::isfinite(myy) &&
758+
std::isfinite(mxt) && std::isfinite(myt)) {
762759
if (mxx == 1 && mxy == 0 &&
763760
myx == 0 && myy == 1) {
764761
Translate(mxt, myt);
@@ -788,10 +785,14 @@ void DisplayListBuilder::TransformFullPerspective(
788785
mwx == 0 && mwy == 0 && mwz == 0 && mwt == 1) {
789786
Transform2DAffine(mxx, mxy, mxt,
790787
myx, myy, myt);
791-
} else if (SkScalarsAreFinite(mxx, mxy) && SkScalarsAreFinite(mxz, mxt) &&
792-
SkScalarsAreFinite(myx, myy) && SkScalarsAreFinite(myz, myt) &&
793-
SkScalarsAreFinite(mzx, mzy) && SkScalarsAreFinite(mzz, mzt) &&
794-
SkScalarsAreFinite(mwx, mwy) && SkScalarsAreFinite(mwz, mwt)) {
788+
} else if (std::isfinite(mxx) && std::isfinite(mxy) &&
789+
std::isfinite(mxz) && std::isfinite(mxt) &&
790+
std::isfinite(myx) && std::isfinite(myy) &&
791+
std::isfinite(myz) && std::isfinite(myt) &&
792+
std::isfinite(mzx) && std::isfinite(mzy) &&
793+
std::isfinite(mzz) && std::isfinite(mzt) &&
794+
std::isfinite(mwx) && std::isfinite(mwy) &&
795+
std::isfinite(mwz) && std::isfinite(mwt)) {
795796
checkForDeferredSave();
796797
Push<TransformFullPerspectiveOp>(0,
797798
mxx, mxy, mxz, mxt,
@@ -1377,7 +1378,7 @@ void DisplayListBuilder::DrawAtlas(const sk_sp<DlImage>& atlas,
13771378

13781379
void DisplayListBuilder::DrawDisplayList(const sk_sp<DisplayList> display_list,
13791380
SkScalar opacity) {
1380-
if (!SkScalarIsFinite(opacity) || opacity <= SK_ScalarNearlyZero ||
1381+
if (!std::isfinite(opacity) || opacity <= SK_ScalarNearlyZero ||
13811382
display_list->op_count() == 0 || display_list->bounds().isEmpty() ||
13821383
current_layer_->is_nop_) {
13831384
return;

‎display_list/dl_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ class DisplayListBuilder final : public virtual DlCanvas,
509509
// kInvalidSigma is used to indicate that no MaskBlur is currently set.
510510
static constexpr SkScalar kInvalidSigma = 0.0;
511511
static bool mask_sigma_valid(SkScalar sigma) {
512-
return SkScalarIsFinite(sigma) && sigma > 0.0;
512+
return std::isfinite(sigma) && sigma > 0.0;
513513
}
514514

515515
class SaveInfo {

‎display_list/effects/dl_color_filter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ bool DlMatrixColorFilter::modifies_transparent_black() const {
147147
// equation ends up becoming A' = matrix_[19]. Negative results will be
148148
// clamped to the range [0,1] so we only care about positive values.
149149
// Non-finite values are clamped to a zero alpha.
150-
return (SkScalarIsFinite(matrix_[19]) && matrix_[19] > 0);
150+
return (std::isfinite(matrix_[19]) && matrix_[19] > 0);
151151
}
152152

153153
bool DlMatrixColorFilter::can_commute_with_opacity() const {

‎display_list/effects/dl_image_filter.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ class DlImageFilter : public DlAttribute<DlImageFilter, DlImageFilterType> {
138138
static SkVector map_vectors_affine(const SkMatrix& ctm,
139139
SkScalar x,
140140
SkScalar y) {
141-
FML_DCHECK(SkScalarIsFinite(x) && x >= 0);
142-
FML_DCHECK(SkScalarIsFinite(y) && y >= 0);
141+
FML_DCHECK(std::isfinite(x) && x >= 0);
142+
FML_DCHECK(std::isfinite(y) && y >= 0);
143143
FML_DCHECK(ctm.isFinite() && !ctm.hasPerspective());
144144

145145
// The x and y scalars would have been used to expand a local space
@@ -231,7 +231,7 @@ class DlBlurImageFilter final : public DlImageFilter {
231231
static std::shared_ptr<DlImageFilter> Make(SkScalar sigma_x,
232232
SkScalar sigma_y,
233233
DlTileMode tile_mode) {
234-
if (!SkScalarIsFinite(sigma_x) || !SkScalarIsFinite(sigma_y)) {
234+
if (!std::isfinite(sigma_x) || !std::isfinite(sigma_y)) {
235235
return nullptr;
236236
}
237237
if (sigma_x < SK_ScalarNearlyZero && sigma_y < SK_ScalarNearlyZero) {
@@ -302,8 +302,8 @@ class DlDilateImageFilter final : public DlImageFilter {
302302

303303
static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
304304
SkScalar radius_y) {
305-
if (SkScalarIsFinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
306-
SkScalarIsFinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
305+
if (std::isfinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
306+
std::isfinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
307307
return std::make_shared<DlDilateImageFilter>(radius_x, radius_y);
308308
}
309309
return nullptr;
@@ -366,8 +366,8 @@ class DlErodeImageFilter final : public DlImageFilter {
366366

367367
static std::shared_ptr<DlImageFilter> Make(SkScalar radius_x,
368368
SkScalar radius_y) {
369-
if (SkScalarIsFinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
370-
SkScalarIsFinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
369+
if (std::isfinite(radius_x) && radius_x > SK_ScalarNearlyZero &&
370+
std::isfinite(radius_y) && radius_y > SK_ScalarNearlyZero) {
371371
return std::make_shared<DlErodeImageFilter>(radius_x, radius_y);
372372
}
373373
return nullptr;

‎display_list/effects/dl_mask_filter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class DlBlurMaskFilter final : public DlMaskFilter {
5353
static std::shared_ptr<DlMaskFilter> Make(DlBlurStyle style,
5454
SkScalar sigma,
5555
bool respect_ctm = true) {
56-
if (SkScalarIsFinite(sigma) && sigma > 0) {
56+
if (std::isfinite(sigma) && sigma > 0) {
5757
return std::make_shared<DlBlurMaskFilter>(style, sigma, respect_ctm);
5858
}
5959
return nullptr;

‎display_list/testing/dl_rendering_unittests.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4111,7 +4111,7 @@ TEST_F(DisplayListRendering, MatrixColorFilterOpacityCommuteCheck) {
41114111
"matrix[" + std::to_string(element) + "] = " + std::to_string(value);
41124112
matrix[element] = value;
41134113
auto filter = DlMatrixColorFilter::Make(matrix);
4114-
EXPECT_EQ(SkScalarIsFinite(value), filter != nullptr);
4114+
EXPECT_EQ(std::isfinite(value), filter != nullptr);
41154115

41164116
DlPaint paint(DlColor(0x80808080));
41174117
DlPaint opacity_save_paint = DlPaint().setOpacity(0.5);

0 commit comments

Comments
 (0)