[skia] Add missing param to makeRasterImage calls (flutter#172122)

kjlubick · web-flow · commit 81e1d5ec26f4 · 2025-07-15T22:16:00.000Z
Skia's makeRasterImage takes a (now required) `GrDirectContext` param. This updates Flutter to provide something there - either nullptr or a context that seemed to be related. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
diff --git a/engine/src/flutter/display_list/testing/dl_test_surface_provider.cc b/engine/src/flutter/display_list/testing/dl_test_surface_provider.cc
@@ -44,7 +44,7 @@ bool DlSurfaceProvider::Snapshot(std::string& filename) const {
   if (!image) {
     return false;
   }
-  auto raster = image->makeRasterImage();
+  auto raster = image->makeRasterImage(nullptr);
   if (!raster) {
     return false;
   }
diff --git a/engine/src/flutter/flow/layers/offscreen_surface.cc b/engine/src/flutter/flow/layers/offscreen_surface.cc
@@ -47,7 +47,7 @@ static sk_sp<SkData> GetRasterData(const sk_sp<SkSurface>& offscreen_surface,
 
   // Copy the GPU image snapshot into CPU memory.
   // TODO (https://github.com/flutter/flutter/issues/13498)
-  auto cpu_snapshot = potentially_gpu_snapshot->makeRasterImage();
+  auto cpu_snapshot = potentially_gpu_snapshot->makeRasterImage(nullptr);
   if (!cpu_snapshot) {
     FML_LOG(ERROR) << "Screenshot: unable to make raster image";
     return nullptr;
diff --git a/engine/src/flutter/lib/ui/painting/image_decoder_skia.cc b/engine/src/flutter/lib/ui/painting/image_decoder_skia.cc
@@ -41,7 +41,7 @@ static sk_sp<SkImage> ResizeRasterImage(const sk_sp<SkImage>& image,
   }
 
   if (image->dimensions() == resized_dimensions) {
-    return image->makeRasterImage();
+    return image->makeRasterImage(nullptr);
   }
 
   const auto scaled_image_info =
@@ -92,7 +92,7 @@ static sk_sp<SkImage> ImageFromDecompressedData(
 
   if (!target_width && !target_height) {
     // No resizing requested. Just rasterize the image.
-    return image->makeRasterImage();
+    return image->makeRasterImage(nullptr);
   }
 
   return ResizeRasterImage(image, SkISize::Make(target_width, target_height),
@@ -110,7 +110,7 @@ sk_sp<SkImage> ImageDecoderSkia::ImageFromCompressedData(
   if (!descriptor->should_resize(target_width, target_height)) {
     // No resizing requested. Just decode & rasterize the image.
     sk_sp<SkImage> image = descriptor->image();
-    return image ? image->makeRasterImage() : nullptr;
+    return image ? image->makeRasterImage(nullptr) : nullptr;
   }
 
   const SkISize source_dimensions = descriptor->image_info().dimensions();
diff --git a/engine/src/flutter/lib/ui/painting/image_encoding_impl.h b/engine/src/flutter/lib/ui/painting/image_encoding_impl.h
@@ -53,7 +53,7 @@ sk_sp<SkImage> ConvertToRasterUsingResourceContext(
     return nullptr;
   }
 
-  return snapshot->makeRasterImage();
+  return snapshot->makeRasterImage(resource_context.get());
 }
 
 }  // namespace flutter
diff --git a/engine/src/flutter/lib/ui/painting/image_encoding_skia.cc b/engine/src/flutter/lib/ui/painting/image_encoding_skia.cc
@@ -45,7 +45,8 @@ void ConvertImageToRasterSkia(
       return;
     }
 
-    if (sk_sp<SkImage> raster_image = image->makeRasterImage()) {
+    if (sk_sp<SkImage> raster_image =
+            image->makeRasterImage(resource_context.get())) {
       // The image can be converted to a raster image.
       encode_task(raster_image);
       return;
diff --git a/engine/src/flutter/shell/common/snapshot_controller_skia.cc b/engine/src/flutter/shell/common/snapshot_controller_skia.cc
@@ -42,7 +42,7 @@ sk_sp<SkImage> DrawSnapshot(
 
   {
     TRACE_EVENT0("flutter", "DeviceHostTransfer");
-    if (auto raster_image = device_snapshot->makeRasterImage()) {
+    if (auto raster_image = device_snapshot->makeRasterImage(nullptr)) {
       return raster_image;
     }
   }
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_gl.cc
@@ -130,7 +130,8 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition(
   }
 
   if (next_scene_callback_) {
-    auto last_composition_snapshot = last_composition_->makeRasterImage();
+    auto last_composition_snapshot =
+        last_composition_->makeRasterImage(nullptr);
     FML_CHECK(last_composition_snapshot);
     auto callback = next_scene_callback_;
     next_scene_callback_ = nullptr;
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_metal.mm b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_metal.mm
@@ -111,7 +111,7 @@
   }
 
   if (next_scene_callback_) {
-    auto last_composition_snapshot = last_composition_->makeRasterImage();
+    auto last_composition_snapshot = last_composition_->makeRasterImage(nullptr);
     FML_CHECK(last_composition_snapshot);
     auto callback = next_scene_callback_;
     next_scene_callback_ = nullptr;
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_software.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_software.cc
@@ -107,7 +107,8 @@ bool EmbedderTestCompositorSoftware::UpdateOffscrenComposition(
   }
 
   if (next_scene_callback_) {
-    auto last_composition_snapshot = last_composition_->makeRasterImage();
+    auto last_composition_snapshot =
+        last_composition_->makeRasterImage(nullptr);
     FML_CHECK(last_composition_snapshot);
     auto callback = next_scene_callback_;
     next_scene_callback_ = nullptr;
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc
@@ -119,7 +119,8 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition(
   }
 
   if (next_scene_callback_) {
-    auto last_composition_snapshot = last_composition_->makeRasterImage();
+    auto last_composition_snapshot =
+        last_composition_->makeRasterImage(nullptr);
     FML_CHECK(last_composition_snapshot);
     auto callback = next_scene_callback_;
     next_scene_callback_ = nullptr;
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests_util.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_unittests_util.cc
@@ -160,7 +160,7 @@ bool ImageMatchesFixture(const std::string& fixture_file_name,
       fixture_image_mapping.GetMapping(), fixture_image_mapping.GetSize());
   auto fixture_image =
       SkImages::DeferredFromEncodedData(std::move(encoded_image))
-          ->makeRasterImage();
+          ->makeRasterImage(nullptr);
 
   FML_CHECK(fixture_image) << "Could not create image from fixture: "
                            << fixture_file_name;
diff --git a/engine/src/flutter/testing/test_gl_surface.cc b/engine/src/flutter/testing/test_gl_surface.cc
@@ -207,7 +207,7 @@ sk_sp<SkImage> TestGLOnscreenOnlySurface::GetRasterSurfaceSnapshot() {
     return nullptr;
   }
 
-  auto host_snapshot = device_snapshot->makeRasterImage();
+  auto host_snapshot = device_snapshot->makeRasterImage(nullptr);
 
   if (!host_snapshot) {
     FML_LOG(ERROR) << "Could not create the host snapshot while attempting to "
diff --git a/engine/src/flutter/testing/test_metal_surface_impl.mm b/engine/src/flutter/testing/test_metal_surface_impl.mm
@@ -87,7 +87,7 @@
     return nullptr;
   }
 
-  auto host_snapshot = device_snapshot->makeRasterImage();
+  auto host_snapshot = device_snapshot->makeRasterImage(nullptr);
 
   if (!host_snapshot) {
     FML_LOG(ERROR) << "Could not create the host snapshot while attempting to "
diff --git a/engine/src/flutter/testing/test_vulkan_surface.cc b/engine/src/flutter/testing/test_vulkan_surface.cc
@@ -95,7 +95,7 @@ sk_sp<SkImage> TestVulkanSurface::GetSurfaceSnapshot() const {
     return nullptr;
   }
 
-  auto host_snapshot = device_snapshot->makeRasterImage();
+  auto host_snapshot = device_snapshot->makeRasterImage(nullptr);
 
   if (!host_snapshot) {
     FML_LOG(ERROR) << "Could not create the host snapshot while attempting to "

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ bool DlSurfaceProvider::Snapshot(std::string& filename) const {`
`44`	`44`	`if (!image) {`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`		`- auto raster = image->makeRasterImage();`
	`47`	`+ auto raster = image->makeRasterImage(nullptr);`
`48`	`48`	`if (!raster) {`
`49`	`49`	`return false;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static sk_sp<SkImage> ResizeRasterImage(const sk_sp<SkImage>& image,`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if (image->dimensions() == resized_dimensions) {`
`44`		`- return image->makeRasterImage();`
	`44`	`+ return image->makeRasterImage(nullptr);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`const auto scaled_image_info =`
`@@ -92,7 +92,7 @@ static sk_sp<SkImage> ImageFromDecompressedData(`
`92`	`92`
`93`	`93`	`if (!target_width && !target_height) {`
`94`	`94`	`// No resizing requested. Just rasterize the image.`
`95`		`- return image->makeRasterImage();`
	`95`	`+ return image->makeRasterImage(nullptr);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return ResizeRasterImage(image, SkISize::Make(target_width, target_height),`
`@@ -110,7 +110,7 @@ sk_sp<SkImage> ImageDecoderSkia::ImageFromCompressedData(`
`110`	`110`	`if (!descriptor->should_resize(target_width, target_height)) {`
`111`	`111`	`// No resizing requested. Just decode & rasterize the image.`
`112`	`112`	`sk_sp<SkImage> image = descriptor->image();`
`113`		`- return image ? image->makeRasterImage() : nullptr;`
	`113`	`+ return image ? image->makeRasterImage(nullptr) : nullptr;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`const SkISize source_dimensions = descriptor->image_info().dimensions();`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ sk_sp<SkImage> ConvertToRasterUsingResourceContext(`
`53`	`53`	`return nullptr;`
`54`	`54`	`}`
`55`	`55`
`56`		`- return snapshot->makeRasterImage();`
	`56`	`+ return snapshot->makeRasterImage(resource_context.get());`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`} // namespace flutter`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ void ConvertImageToRasterSkia(`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (sk_sp<SkImage> raster_image = image->makeRasterImage()) {`
	`48`	`+ if (sk_sp<SkImage> raster_image =`
	`49`	`+ image->makeRasterImage(resource_context.get())) {`
`49`	`50`	`// The image can be converted to a raster image.`
`50`	`51`	`encode_task(raster_image);`
`51`	`52`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ sk_sp<SkImage> DrawSnapshot(`
`42`	`42`
`43`	`43`	`{`
`44`	`44`	`TRACE_EVENT0("flutter", "DeviceHostTransfer");`
`45`		`- if (auto raster_image = device_snapshot->makeRasterImage()) {`
	`45`	`+ if (auto raster_image = device_snapshot->makeRasterImage(nullptr)) {`
`46`	`46`	`return raster_image;`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition(`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`if (next_scene_callback_) {`
`133`		`- auto last_composition_snapshot = last_composition_->makeRasterImage();`
	`133`	`+ auto last_composition_snapshot =`
	`134`	`+ last_composition_->makeRasterImage(nullptr);`
`134`	`135`	`FML_CHECK(last_composition_snapshot);`
`135`	`136`	`auto callback = next_scene_callback_;`
`136`	`137`	`next_scene_callback_ = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if (next_scene_callback_) {`
`114`		`- auto last_composition_snapshot = last_composition_->makeRasterImage();`
	`114`	`+ auto last_composition_snapshot = last_composition_->makeRasterImage(nullptr);`
`115`	`115`	`FML_CHECK(last_composition_snapshot);`
`116`	`116`	`auto callback = next_scene_callback_;`
`117`	`117`	`next_scene_callback_ = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ bool EmbedderTestCompositorSoftware::UpdateOffscrenComposition(`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (next_scene_callback_) {`
`110`		`- auto last_composition_snapshot = last_composition_->makeRasterImage();`
	`110`	`+ auto last_composition_snapshot =`
	`111`	`+ last_composition_->makeRasterImage(nullptr);`
`111`	`112`	`FML_CHECK(last_composition_snapshot);`
`112`	`113`	`auto callback = next_scene_callback_;`
`113`	`114`	`next_scene_callback_ = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition(`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if (next_scene_callback_) {`
`122`		`- auto last_composition_snapshot = last_composition_->makeRasterImage();`
	`122`	`+ auto last_composition_snapshot =`
	`123`	`+ last_composition_->makeRasterImage(nullptr);`
`123`	`124`	`FML_CHECK(last_composition_snapshot);`
`124`	`125`	`auto callback = next_scene_callback_;`
`125`	`126`	`next_scene_callback_ = nullptr;`