[skottie] Clean up deprecated ImageAsset API

All clients have been updated. Change-Id: I389e11fa59eca1ec72dcad48899f505a675dadcc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/679376 Auto-Submit: Florin Malita <[email protected]> Reviewed-by: Jorge Betancourt <[email protected]> Commit-Queue: Jorge Betancourt <[email protected]>
armansito · Apr 25, 2023 · 2a2d795 · 2a2d795
1 parent a496513
commit 2a2d795
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/modules/skottie/src/layers/FootageLayer.cpp b/modules/skottie/src/layers/FootageLayer.cpp
@@ -23,17 +23,11 @@ SkMatrix image_matrix(const ImageAsset::FrameData& frame_data, const SkISize& de
         return SkMatrix::I();
     }
 
-#ifdef SKOTTIE_LEGACY_ASSET_FIT
-    const auto size_fit_matrix = SkMatrix::RectToRect(SkRect::Make(frame_data.image->bounds()),
-                                                      SkRect::Make(dest_size),
-                                                      frame_data.scaling);
-#else
     const auto size_fit_matrix = frame_data.scaling == ImageAsset::SizeFit::kNone
             ? SkMatrix::I()
             : SkMatrix::RectToRect(SkRect::Make(frame_data.image->bounds()),
                                    SkRect::Make(dest_size),
                                    static_cast<SkMatrix::ScaleToFit>(frame_data.scaling));
-#endif
 
     return frame_data.matrix * size_fit_matrix;
 }

diff --git a/modules/skresources/include/SkResources.h b/modules/skresources/include/SkResources.h
@@ -70,11 +70,7 @@ class SK_API ImageAsset : public SkRefCnt {
         // Additional image transform to be applied before AE scaling rules.
         SkMatrix          matrix = SkMatrix::I();
         // Strategy for image size -> AE asset size scaling.
-#ifdef SKOTTIE_LEGACY_ASSET_FIT
-        SkMatrix::ScaleToFit scaling = SkMatrix::kCenter_ScaleToFit;
-#else
         SizeFit           scaling = SizeFit::kCenter;
-#endif
     };
 
     /**

diff --git a/modules/skresources/src/SkResources.cpp b/modules/skresources/src/SkResources.cpp
@@ -102,11 +102,7 @@ ImageAsset::FrameData ImageAsset::getFrameData(float t) {
         this->getFrame(t),
         SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNearest),
         SkMatrix::I(),
-#ifdef SKOTTIE_LEGACY_ASSET_FIT
-        SkMatrix::kCenter_ScaleToFit,
-#else
         SizeFit::kCenter,
-#endif
     };
 }