fix shell unittest test failed

flow/raster_cacheable_entry.cc

@@ -69,7 +69,7 @@ std::unique_ptr<RasterCacheResult> LayerCacheableItem::CreateRasterCache(
         PaintContext context = {
             // clang-format off
           .internal_nodes_canvas         = static_cast<SkCanvas*>(&internal_nodes_canvas),
-          .leaf_nodes_canvas             = paint_context->leaf_nodes_canvas,
+          .leaf_nodes_canvas             = canvas,
           .gr_context                    = paint_context->gr_context,
           .dst_color_space               = paint_context->dst_color_space,
           .view_embedder                 = paint_context->view_embedder,

shell/common/shell_unittests.cc

@@ -2412,17 +2412,17 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
 
   // 2. Rasterize the picture and the picture layer in the raster cache.
   std::promise<bool> rasterized;
-  shell->GetTaskRunners().GetRasterTaskRunner()->PostTask([&shell, &rasterized,
-                                                           &picture] {
-    auto* compositor_context = shell->GetRasterizer()->compositor_context();
-    auto& raster_cache = compositor_context->raster_cache();
-
-    FixedRefreshRateStopwatch raster_time;
-    FixedRefreshRateStopwatch ui_time;
-    MutatorsStack mutators_stack;
-    TextureRegistry texture_registry;
-    PaintContext paint_context = {
-        // clang-format off
+  shell->GetTaskRunners().GetRasterTaskRunner()->PostTask(
+      [&shell, &rasterized, &picture, &picture_layer] {
+        auto* compositor_context = shell->GetRasterizer()->compositor_context();
+        auto& raster_cache = compositor_context->raster_cache();
+
+        FixedRefreshRateStopwatch raster_time;
+        FixedRefreshRateStopwatch ui_time;
+        MutatorsStack mutators_stack;
+        TextureRegistry texture_registry;
+        PaintContext paint_context = {
+            // clang-format off
             .internal_nodes_canvas         = nullptr,
             .leaf_nodes_canvas             = nullptr,
             .gr_context                    = nullptr,
@@ -2435,26 +2435,28 @@ TEST_F(ShellTest, OnServiceProtocolEstimateRasterCacheMemoryWorks) {
             .checkerboard_offscreen_layers = false,
             .frame_device_pixel_ratio      = 1.0f,
             .inherited_opacity             = SK_Scalar1,
-        // clang-format on
-    };
-
-    // 2.1. Rasterize the picture. Call Draw multiple times to pass the
-    // access threshold (default to 3) so a cache can be generated.
-    SkCanvas dummy_canvas;
-    bool picture_cache_generated;
-    SkPictureCacheableItem cacheable_picture(
-        picture.get(), picture.get()->cullRect(), SkMatrix::I(), true, false);
-    cacheable_picture.set_matrix(SkMatrix::I());
-    for (int i = 0; i < 4; i += 1) {
-      picture_cache_generated = cacheable_picture.Prepare(&paint_context);
-      cacheable_picture.Draw(paint_context.raster_cache, dummy_canvas);
-    }
-    ASSERT_TRUE(picture_cache_generated);
+            // clang-format on
+        };
+
+        // 2.1. Rasterize the picture. Call Draw multiple times to pass the
+        // access threshold (default to 3) so a cache can be generated.
+        SkCanvas dummy_canvas;
+        bool picture_cache_generated;
+        SkPictureCacheableItem cacheable_picture(picture.get(),
+                                                 picture.get()->cullRect(),
+                                                 SkMatrix::I(), true, false);
+        cacheable_picture.set_matrix(SkMatrix::I());
+        for (int i = 0; i < 4; i += 1) {
+          picture_cache_generated = cacheable_picture.Prepare(&paint_context);
+          cacheable_picture.Draw(paint_context.raster_cache, dummy_canvas);
+        }
+        ASSERT_TRUE(picture_cache_generated);
 
-    // 2.2. Rasterize the picture layer.
-    cacheable_picture.Prepare(&paint_context);
-    rasterized.set_value(true);
-  });
+        // 2.2. Rasterize the picture layer.
+        LayerCacheableItem layer_item(picture_layer.get());
+        layer_item.Prepare(&paint_context);
+        rasterized.set_value(true);
+      });
   rasterized.get_future().wait();
 
   // 3. Call the service protocol and check its output.