[Impeller] delete impeller image class. (#54767)

Jonah Williams · web-flow · commit 532955d81df4 · 2024-08-26T00:20:32.000Z
This class does nothing but wrap impeller::Texture. Lets just use impeller::Texture.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -42629,8 +42629,6 @@ ORIGIN: ../../../flutter/impeller/aiks/color_source.cc + ../../../flutter/LICENS
 ORIGIN: ../../../flutter/impeller/aiks/color_source.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/experimental_canvas.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/experimental_canvas.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/aiks/image.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/aiks/image.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/image_filter.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/image_filter.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/paint.cc + ../../../flutter/LICENSE
@@ -45518,8 +45516,6 @@ FILE: ../../../flutter/impeller/aiks/color_source.cc
 FILE: ../../../flutter/impeller/aiks/color_source.h
 FILE: ../../../flutter/impeller/aiks/experimental_canvas.cc
 FILE: ../../../flutter/impeller/aiks/experimental_canvas.h
-FILE: ../../../flutter/impeller/aiks/image.cc
-FILE: ../../../flutter/impeller/aiks/image.h
 FILE: ../../../flutter/impeller/aiks/image_filter.cc
 FILE: ../../../flutter/impeller/aiks/image_filter.h
 FILE: ../../../flutter/impeller/aiks/paint.cc
diff --git a/display_list/testing/dl_test_surface_metal.cc b/display_list/testing/dl_test_surface_metal.cc
@@ -118,9 +118,8 @@ sk_sp<DlImage> DlMetalSurfaceProvider::MakeImpellerImage(
                        flutter::DlBlendMode::kSrc);
   list->Dispatch(dispatcher);
   auto picture = dispatcher.EndRecordingAsPicture();
-  std::shared_ptr<impeller::Image> image =
+  std::shared_ptr<impeller::Texture> texture =
       picture.ToImage(*aiks_context_, {width, height});
-  std::shared_ptr<impeller::Texture> texture = image->GetTexture();
   return impeller::DlImageImpeller::Make(texture);
 
 #endif  // EXPERIMENTAL_CANVAS
diff --git a/impeller/aiks/BUILD.gn b/impeller/aiks/BUILD.gn
@@ -16,8 +16,6 @@ impeller_component("aiks") {
     "color_source.h",
     "experimental_canvas.cc",
     "experimental_canvas.h",
-    "image.cc",
-    "image.h",
     "image_filter.cc",
     "image_filter.h",
     "paint.cc",
diff --git a/impeller/aiks/aiks_blend_unittests.cc b/impeller/aiks/aiks_blend_unittests.cc
@@ -84,7 +84,7 @@ TEST_P(AiksTest, ColorWheel) {
     }
   };
 
-  std::shared_ptr<Image> color_wheel_image;
+  std::shared_ptr<Texture> color_wheel_image;
   Matrix color_wheel_transform;
 
   auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
@@ -131,7 +131,7 @@ TEST_P(AiksTest, ColorWheel) {
       if (!snapshot.has_value() || !snapshot->texture) {
         return std::nullopt;
       }
-      color_wheel_image = std::make_shared<Image>(snapshot->texture);
+      color_wheel_image = snapshot->texture;
       color_wheel_transform = snapshot->transform;
     }
 
diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc
@@ -16,7 +16,6 @@
 #include "gtest/gtest.h"
 #include "impeller/aiks/canvas.h"
 #include "impeller/aiks/color_filter.h"
-#include "impeller/aiks/image.h"
 #include "impeller/aiks/image_filter.h"
 #include "impeller/aiks/testing/context_spy.h"
 #include "impeller/core/device_buffer.h"
@@ -126,7 +125,7 @@ TEST_P(AiksTest, DrawPaintAbsorbsClears) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
@@ -150,7 +149,7 @@ TEST_P(AiksTest,
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(),
             GetBackend() == PlaygroundBackend::kOpenGLES ? 4llu : 3llu);
@@ -171,7 +170,7 @@ TEST_P(AiksTest, DrawRectAbsorbsClears) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
@@ -191,7 +190,7 @@ TEST_P(AiksTest, DrawRectAbsorbsClearsNegativeRRect) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
@@ -211,7 +210,7 @@ TEST_P(AiksTest, DrawRectAbsorbsClearsNegativeRotation) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
@@ -231,7 +230,7 @@ TEST_P(AiksTest, DrawRectAbsorbsClearsNegative) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {301, 301});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {301, 301});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
@@ -255,7 +254,7 @@ TEST_P(AiksTest, ClipRectElidesNoOpClips) {
   std::shared_ptr<Context> real_context = GetContext();
   std::shared_ptr<ContextMock> mock_context = spy->MakeContext(real_context);
   AiksContext renderer(mock_context, nullptr);
-  std::shared_ptr<Image> image = picture.ToImage(renderer, {300, 300});
+  std::shared_ptr<Texture> image = picture.ToImage(renderer, {300, 300});
 
   ASSERT_EQ(spy->render_passes_.size(), 1llu);
   std::shared_ptr<RenderPass> render_pass = spy->render_passes_[0];
diff --git a/impeller/aiks/canvas.cc b/impeller/aiks/canvas.cc
@@ -719,7 +719,7 @@ void Canvas::DrawPoints(std::vector<Point> points,
   AddRenderEntityToCurrentPass(std::move(entity));
 }
 
-void Canvas::DrawImage(const std::shared_ptr<Image>& image,
+void Canvas::DrawImage(const std::shared_ptr<Texture>& image,
                        Point offset,
                        const Paint& paint,
                        SamplerDescriptor sampler) {
@@ -733,7 +733,7 @@ void Canvas::DrawImage(const std::shared_ptr<Image>& image,
   DrawImageRect(image, source, dest, paint, std::move(sampler));
 }
 
-void Canvas::DrawImageRect(const std::shared_ptr<Image>& image,
+void Canvas::DrawImageRect(const std::shared_ptr<Texture>& image,
                            Rect source,
                            Rect dest,
                            const Paint& paint,
@@ -750,7 +750,7 @@ void Canvas::DrawImageRect(const std::shared_ptr<Image>& image,
   }
 
   auto texture_contents = TextureContents::MakeRect(dest);
-  texture_contents->SetTexture(image->GetTexture());
+  texture_contents->SetTexture(image);
   texture_contents->SetSourceRect(source);
   texture_contents->SetStrictSourceRect(src_rect_constraint ==
                                         SourceRectConstraint::kStrict);
@@ -991,7 +991,7 @@ void Canvas::DrawVertices(const std::shared_ptr<VerticesGeometry>& vertices,
   AddRenderEntityToCurrentPass(std::move(entity));
 }
 
-void Canvas::DrawAtlas(const std::shared_ptr<Image>& atlas,
+void Canvas::DrawAtlas(const std::shared_ptr<Texture>& atlas,
                        std::vector<Matrix> transforms,
                        std::vector<Rect> texture_coordinates,
                        std::vector<Color> colors,
@@ -1007,7 +1007,7 @@ void Canvas::DrawAtlas(const std::shared_ptr<Image>& atlas,
   contents->SetColors(std::move(colors));
   contents->SetTransforms(std::move(transforms));
   contents->SetTextureCoordinates(std::move(texture_coordinates));
-  contents->SetTexture(atlas->GetTexture());
+  contents->SetTexture(atlas);
   contents->SetSamplerDescriptor(std::move(sampler));
   contents->SetBlendMode(blend_mode);
   contents->SetCullRect(cull_rect);
diff --git a/impeller/aiks/canvas.h b/impeller/aiks/canvas.h
@@ -11,7 +11,6 @@
 #include <optional>
 #include <vector>
 
-#include "impeller/aiks/image.h"
 #include "impeller/aiks/image_filter.h"
 #include "impeller/aiks/paint.h"
 #include "impeller/aiks/picture.h"
@@ -129,13 +128,13 @@ class Canvas {
                   const Paint& paint,
                   PointStyle point_style);
 
-  void DrawImage(const std::shared_ptr<Image>& image,
+  void DrawImage(const std::shared_ptr<Texture>& image,
                  Point offset,
                  const Paint& paint,
                  SamplerDescriptor sampler = {});
 
   void DrawImageRect(
-      const std::shared_ptr<Image>& image,
+      const std::shared_ptr<Texture>& image,
       Rect source,
       Rect dest,
       const Paint& paint,
@@ -167,7 +166,7 @@ class Canvas {
                     BlendMode blend_mode,
                     const Paint& paint);
 
-  void DrawAtlas(const std::shared_ptr<Image>& atlas,
+  void DrawAtlas(const std::shared_ptr<Texture>& atlas,
                  std::vector<Matrix> transforms,
                  std::vector<Rect> texture_coordinates,
                  std::vector<Color> colors,
diff --git a/impeller/aiks/image.cc b/impeller/aiks/image.cc
diff --git a/impeller/aiks/image.h b/impeller/aiks/image.h
diff --git a/impeller/aiks/picture.cc b/impeller/aiks/picture.cc
@@ -28,13 +28,12 @@ std::optional<Snapshot> Picture::Snapshot(AiksContext& context) {
       .transform = Matrix::MakeTranslation(coverage->GetOrigin())};
 }
 
-std::shared_ptr<Image> Picture::ToImage(AiksContext& context,
-                                        ISize size) const {
+std::shared_ptr<Texture> Picture::ToImage(AiksContext& context,
+                                          ISize size) const {
   if (size.IsEmpty()) {
     return nullptr;
   }
-  auto texture = RenderToTexture(context, size);
-  return texture ? std::make_shared<Image>(texture) : nullptr;
+  return RenderToTexture(context, size);
 }
 
 std::shared_ptr<Texture> Picture::RenderToTexture(
diff --git a/impeller/aiks/picture.h b/impeller/aiks/picture.h
@@ -9,7 +9,6 @@
 #include <optional>
 
 #include "impeller/aiks/aiks_context.h"
-#include "impeller/aiks/image.h"
 #include "impeller/entity/entity_pass.h"
 
 namespace impeller {
@@ -19,7 +18,7 @@ struct Picture {
 
   std::optional<Snapshot> Snapshot(AiksContext& context);
 
-  std::shared_ptr<Image> ToImage(AiksContext& context, ISize size) const;
+  std::shared_ptr<Texture> ToImage(AiksContext& context, ISize size) const;
 
  private:
   std::shared_ptr<Texture> RenderToTexture(
diff --git a/impeller/display_list/dl_dispatcher.cc b/impeller/display_list/dl_dispatcher.cc
@@ -1017,12 +1017,11 @@ void DlDispatcherBase::drawImageRect(
     flutter::DlImageSampling sampling,
     bool render_with_attributes,
     SrcRectConstraint constraint = SrcRectConstraint::kFast) {
-  GetCanvas().DrawImageRect(
-      std::make_shared<Image>(image->impeller_texture()),  // image
-      skia_conversions::ToRect(src),                       // source rect
-      skia_conversions::ToRect(dst),                       // destination rect
-      render_with_attributes ? paint_ : Paint(),           // paint
-      ToSamplerDescriptor(sampling)                        // sampling
+  GetCanvas().DrawImageRect(image->impeller_texture(),      // image
+                            skia_conversions::ToRect(src),  // source rect
+                            skia_conversions::ToRect(dst),  // destination rect
+                            render_with_attributes ? paint_ : Paint(),  // paint
+                            ToSamplerDescriptor(sampling)  // sampling
   );
 }
 
@@ -1034,7 +1033,7 @@ void DlDispatcherBase::drawImageNine(const sk_sp<flutter::DlImage> image,
                                      bool render_with_attributes) {
   NinePatchConverter converter = {};
   converter.DrawNinePatch(
-      std::make_shared<Image>(image->impeller_texture()),
+      image->impeller_texture(),
       Rect::MakeLTRB(center.fLeft, center.fTop, center.fRight, center.fBottom),
       skia_conversions::ToRect(dst), ToSamplerDescriptor(filter), &GetCanvas(),
       &paint_);
@@ -1050,12 +1049,11 @@ void DlDispatcherBase::drawAtlas(const sk_sp<flutter::DlImage> atlas,
                                  flutter::DlImageSampling sampling,
                                  const SkRect* cull_rect,
                                  bool render_with_attributes) {
-  GetCanvas().DrawAtlas(std::make_shared<Image>(atlas->impeller_texture()),
-                        skia_conversions::ToRSXForms(xform, count),
-                        skia_conversions::ToRects(tex, count),
-                        ToColors(colors, count), ToBlendMode(mode),
-                        ToSamplerDescriptor(sampling),
-                        skia_conversions::ToRect(cull_rect), paint_);
+  GetCanvas().DrawAtlas(
+      atlas->impeller_texture(), skia_conversions::ToRSXForms(xform, count),
+      skia_conversions::ToRects(tex, count), ToColors(colors, count),
+      ToBlendMode(mode), ToSamplerDescriptor(sampling),
+      skia_conversions::ToRect(cull_rect), paint_);
 }
 
 // |flutter::DlOpReceiver|
diff --git a/impeller/display_list/nine_patch_converter.cc b/impeller/display_list/nine_patch_converter.cc
@@ -57,7 +57,7 @@ std::vector<double> NinePatchConverter::InitSlices(double img0,
   // clang-format on
 }
 
-void NinePatchConverter::DrawNinePatch(const std::shared_ptr<Image>& image,
+void NinePatchConverter::DrawNinePatch(const std::shared_ptr<Texture>& image,
                                        Rect center,
                                        Rect dst,
                                        const SamplerDescriptor& sampler,
diff --git a/impeller/display_list/nine_patch_converter.h b/impeller/display_list/nine_patch_converter.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "impeller/aiks/canvas.h"
-#include "impeller/aiks/image.h"
 #include "impeller/aiks/paint.h"
 #include "impeller/core/sampler_descriptor.h"
 
@@ -21,7 +20,7 @@ class NinePatchConverter {
 
   ~NinePatchConverter();
 
-  void DrawNinePatch(const std::shared_ptr<Image>& image,
+  void DrawNinePatch(const std::shared_ptr<Texture>& image,
                      Rect center,
                      Rect dst,
                      const SamplerDescriptor& sampler,
diff --git a/impeller/golden_tests/metal_screenshotter.mm b/impeller/golden_tests/metal_screenshotter.mm
@@ -27,11 +27,10 @@
     bool scale_content) {
   Vector2 content_scale =
       scale_content ? playground_->GetContentScale() : Vector2{1, 1};
-  std::shared_ptr<Image> image = picture.ToImage(
+  std::shared_ptr<Texture> image = picture.ToImage(
       aiks_context,
       ISize(size.width * content_scale.x, size.height * content_scale.y));
-  std::shared_ptr<Texture> texture = image->GetTexture();
-  return MakeScreenshot(aiks_context, texture);
+  return MakeScreenshot(aiks_context, image);
 }
 
 std::unique_ptr<Screenshot> MetalScreenshotter::MakeScreenshot(
diff --git a/impeller/golden_tests/vulkan_screenshotter.mm b/impeller/golden_tests/vulkan_screenshotter.mm
@@ -112,11 +112,10 @@ CGImagePtr flipped_image(CGBitmapContextCreateImage(flipped_context.get()),
     bool scale_content) {
   Vector2 content_scale =
       scale_content ? playground_->GetContentScale() : Vector2{1, 1};
-  std::shared_ptr<Image> image = picture.ToImage(
+  std::shared_ptr<Texture> image = picture.ToImage(
       aiks_context,
       ISize(size.width * content_scale.x, size.height * content_scale.y));
-  std::shared_ptr<Texture> texture = image->GetTexture();
-  return ReadTexture(aiks_context.GetContext(), texture);
+  return ReadTexture(aiks_context.GetContext(), image);
 }
 
 std::unique_ptr<Screenshot> VulkanScreenshotter::MakeScreenshot(
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
diff --git a/shell/common/snapshot_controller_impeller.cc b/shell/common/snapshot_controller_impeller.cc

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ TEST_P(AiksTest, ColorWheel) {`
`84`	`84`	`}`
`85`	`85`	`};`
`86`	`86`
`87`		`- std::shared_ptr<Image> color_wheel_image;`
	`87`	`+ std::shared_ptr<Texture> color_wheel_image;`
`88`	`88`	`Matrix color_wheel_transform;`
`89`	`89`
`90`	`90`	`auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {`
`@@ -131,7 +131,7 @@ TEST_P(AiksTest, ColorWheel) {`
`131`	`131`	`if (!snapshot.has_value() \|\| !snapshot->texture) {`
`132`	`132`	`return std::nullopt;`
`133`	`133`	`}`
`134`		`- color_wheel_image = std::make_shared<Image>(snapshot->texture);`
	`134`	`+ color_wheel_image = snapshot->texture;`
`135`	`135`	`color_wheel_transform = snapshot->transform;`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,12 @@ std::optional<Snapshot> Picture::Snapshot(AiksContext& context) {`
`28`	`28`	`.transform = Matrix::MakeTranslation(coverage->GetOrigin())};`
`29`	`29`	`}`
`30`	`30`
`31`		`-std::shared_ptr<Image> Picture::ToImage(AiksContext& context,`
`32`		`- ISize size) const {`
	`31`	`+std::shared_ptr<Texture> Picture::ToImage(AiksContext& context,`
	`32`	`+ ISize size) const {`
`33`	`33`	`if (size.IsEmpty()) {`
`34`	`34`	`return nullptr;`
`35`	`35`	`}`
`36`		`- auto texture = RenderToTexture(context, size);`
`37`		`- return texture ? std::make_shared<Image>(texture) : nullptr;`
	`36`	`+ return RenderToTexture(context, size);`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`std::shared_ptr<Texture> Picture::RenderToTexture(`