use SkMatrix.invert() instead of MatrixDecomposition to validate cach…

…e matrices (flutter#29530)
nt4f04uNd · Nov 4, 2021 · d229ec8 · d229ec8
1 parent fb20916
commit d229ec8
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 354 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -110,9 +110,6 @@ FILE: ../../../flutter/flow/layers/texture_layer_unittests.cc
 FILE: ../../../flutter/flow/layers/transform_layer.cc
 FILE: ../../../flutter/flow/layers/transform_layer.h
 FILE: ../../../flutter/flow/layers/transform_layer_unittests.cc
-FILE: ../../../flutter/flow/matrix_decomposition.cc
-FILE: ../../../flutter/flow/matrix_decomposition.h
-FILE: ../../../flutter/flow/matrix_decomposition_unittests.cc
 FILE: ../../../flutter/flow/mutators_stack_unittests.cc
 FILE: ../../../flutter/flow/paint_region.cc
 FILE: ../../../flutter/flow/paint_region.h

diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -60,8 +60,6 @@ source_set("flow") {
     "layers/texture_layer.h",
     "layers/transform_layer.cc",
     "layers/transform_layer.h",
-    "matrix_decomposition.cc",
-    "matrix_decomposition.h",
     "paint_region.cc",
     "paint_region.h",
     "paint_utils.cc",
@@ -160,7 +158,6 @@ if (enable_unittests) {
       "layers/shader_mask_layer_unittests.cc",
       "layers/texture_layer_unittests.cc",
       "layers/transform_layer_unittests.cc",
-      "matrix_decomposition_unittests.cc",
       "mutators_stack_unittests.cc",
       "raster_cache_unittests.cc",
       "rtree_unittests.cc",

diff --git a/flow/matrix_decomposition.cc b/flow/matrix_decomposition.cc
diff --git a/flow/matrix_decomposition.h b/flow/matrix_decomposition.h
diff --git a/flow/matrix_decomposition_unittests.cc b/flow/matrix_decomposition_unittests.cc
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -234,11 +234,7 @@ bool RasterCache::Prepare(PrerollContext* context,
   SkMatrix transformation_matrix = untranslated_matrix;
   transformation_matrix.preTranslate(offset.x(), offset.y());
 
-  // Decompose the matrix (once) for all subsequent operations. We want to make
-  // sure to avoid volumetric distortions while accounting for scaling.
-  const MatrixDecomposition matrix(transformation_matrix);
-
-  if (!matrix.IsValid()) {
+  if (!transformation_matrix.invert(nullptr)) {
     // The matrix was singular. No point in going further.
     return false;
   }
@@ -285,11 +281,7 @@ bool RasterCache::Prepare(PrerollContext* context,
   SkMatrix transformation_matrix = untranslated_matrix;
   transformation_matrix.preTranslate(offset.x(), offset.y());
 
-  // Decompose the matrix (once) for all subsequent operations. We want to make
-  // sure to avoid volumetric distortions while accounting for scaling.
-  const MatrixDecomposition matrix(transformation_matrix);
-
-  if (!matrix.IsValid()) {
+  if (!transformation_matrix.invert(nullptr)) {
     // The matrix was singular. No point in going further.
     return false;
   }