From df8bea93c5d5c80a4ad2ea233106606728e2005c Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 10:34:03 -0500 Subject: [PATCH 1/5] SkBudgeted -> skgpu::Budgeted --- display_list/display_list_benchmarks_gl.cc | 5 +++-- flow/layers/offscreen_surface.cc | 3 ++- flow/raster_cache.cc | 3 ++- lib/ui/painting/image_encoding_impl.h | 3 ++- shell/common/rasterizer_unittests.cc | 2 +- shell/common/shell_test_platform_view_vulkan.cc | 2 +- shell/common/snapshot_controller_skia.cc | 3 ++- .../Source/FlutterEmbedderExternalTextureTest.mm | 9 +++++---- .../tests/embedder_test_backingstore_producer.cc | 5 +++-- .../embedder/tests/embedder_test_compositor_gl.cc | 3 ++- .../embedder/tests/embedder_test_compositor_metal.cc | 3 ++- .../embedder/tests/embedder_test_compositor_vulkan.cc | 3 ++- shell/platform/embedder/tests/embedder_unittests_util.cc | 3 ++- 13 files changed, 29 insertions(+), 18 deletions(-) diff --git a/display_list/display_list_benchmarks_gl.cc b/display_list/display_list_benchmarks_gl.cc index 256dcfd34b77f..7762860694537 100644 --- a/display_list/display_list_benchmarks_gl.cc +++ b/display_list/display_list_benchmarks_gl.cc @@ -6,6 +6,7 @@ #include "flutter/display_list/display_list_benchmarks.h" #include "third_party/skia/include/core/SkCanvas.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { @@ -19,7 +20,7 @@ void OpenGLCanvasProvider::InitializeSurface(const size_t width, const auto image_info = SkImageInfo::MakeN32Premul(surface_size_); surface_ = SkSurface::MakeRenderTarget( - gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1, + gl_surface_->GetGrContext().get(), skgpu:Budgeted::kNo, image_info, 1, kTopLeft_GrSurfaceOrigin, nullptr, false); surface_->getCanvas()->clear(SK_ColorTRANSPARENT); } @@ -38,7 +39,7 @@ sk_sp OpenGLCanvasProvider::MakeOffscreenSurface( const auto image_info = SkImageInfo::MakeN32Premul(surface_size_); auto offscreen_surface = SkSurface::MakeRenderTarget( - gl_surface_->GetGrContext().get(), SkBudgeted::kNo, image_info, 1, + gl_surface_->GetGrContext().get(), skgpu:Budgeted::kNo, image_info, 1, kTopLeft_GrSurfaceOrigin, nullptr, false); offscreen_surface->getCanvas()->clear(SK_ColorTRANSPARENT); diff --git a/flow/layers/offscreen_surface.cc b/flow/layers/offscreen_surface.cc index cb29360e576ad..2b0f83d8bc57c 100644 --- a/flow/layers/offscreen_surface.cc +++ b/flow/layers/offscreen_surface.cc @@ -9,6 +9,7 @@ #include "third_party/skia/include/core/SkSerialProcs.h" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/core/SkSurfaceCharacterization.h" +#include "third_party/skia/include/gpu/GpuTypes.h" #include "third_party/skia/include/utils/SkBase64.h" namespace flutter { @@ -21,7 +22,7 @@ static sk_sp CreateSnapshotSurface(GrDirectContext* surface_context, // There is a rendering surface that may contain textures that are going to // be referenced in the layer tree about to be drawn. return SkSurface::MakeRenderTarget( - reinterpret_cast(surface_context), SkBudgeted::kNo, + reinterpret_cast(surface_context), skgpu:Budgeted::kNo, image_info); } diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc index 31f73f5d330a6..8a9bcbd5a2403 100644 --- a/flow/raster_cache.cc +++ b/flow/raster_cache.cc @@ -19,6 +19,7 @@ #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" #include "third_party/skia/include/gpu/GrDirectContext.h" namespace flutter { @@ -64,7 +65,7 @@ std::unique_ptr RasterCache::Rasterize( sk_sp surface = context.gr_context ? SkSurface::MakeRenderTarget( - context.gr_context, SkBudgeted::kYes, image_info) + context.gr_context, skgpu:Budgeted::kYes, image_info) : SkSurface::MakeRaster(image_info); if (!surface) { diff --git a/lib/ui/painting/image_encoding_impl.h b/lib/ui/painting/image_encoding_impl.h index 8708f38996e5d..8f832756dd54e 100644 --- a/lib/ui/painting/image_encoding_impl.h +++ b/lib/ui/painting/image_encoding_impl.h @@ -9,6 +9,7 @@ #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { @@ -28,7 +29,7 @@ sk_sp ConvertToRasterUsingResourceContext( .SetIfFalse([&surface, &surface_info, resource_context] { if (resource_context) { surface = SkSurface::MakeRenderTarget( - resource_context.get(), SkBudgeted::kNo, surface_info); + resource_context.get(), skgpu:Budgeted::kNo, surface_info); } else { surface = SkSurface::MakeRaster(surface_info); } diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index a6f7ab7159e5d..996958f53743a 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -914,7 +914,7 @@ TEST(RasterizerTest, TeardownFreesResourceCache) { auto image_info = SkImageInfo::MakeN32Premul(500, 500, SkColorSpace::MakeSRGB()); auto sk_surface = - SkSurface::MakeRenderTarget(context.get(), SkBudgeted::kYes, image_info); + SkSurface::MakeRenderTarget(context.get(), skgpu:Budgeted::kYes, image_info); EXPECT_TRUE(sk_surface); SkPaint paint; diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc index fa3267ef731da..27c0129017b66 100644 --- a/shell/common/shell_test_platform_view_vulkan.cc +++ b/shell/common/shell_test_platform_view_vulkan.cc @@ -194,7 +194,7 @@ ShellTestPlatformViewVulkan::OffScreenSurface::AcquireFrame( const SkISize& size) { auto image_info = SkImageInfo::Make(size, SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kOpaque_SkAlphaType); - auto surface = SkSurface::MakeRenderTarget(context_.get(), SkBudgeted::kNo, + auto surface = SkSurface::MakeRenderTarget(context_.get(), skgpu:Budgeted::kNo, image_info, 0, nullptr); SurfaceFrame::SubmitCallback callback = [](const SurfaceFrame&, SkCanvas* canvas) -> bool { diff --git a/shell/common/snapshot_controller_skia.cc b/shell/common/snapshot_controller_skia.cc index 62b665cfb1a82..ecf435ff95fc2 100644 --- a/shell/common/snapshot_controller_skia.cc +++ b/shell/common/snapshot_controller_skia.cc @@ -9,6 +9,7 @@ #include "flutter/fml/trace_event.h" #include "flutter/shell/common/snapshot_controller.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { @@ -105,7 +106,7 @@ sk_sp SnapshotControllerSkia::DoMakeRasterSnapshot( // SkSurface because we want to access texture backed images. sk_sp sk_surface = SkSurface::MakeRenderTarget(context, // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info // image info ); if (!sk_surface) { diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm index c4c1f8f08410a..5488f0b39f7d3 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm @@ -18,6 +18,7 @@ #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSamplingOptions.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" @interface TestExternalTexture : NSObject @@ -75,7 +76,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); // Create a texture. MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init]; @@ -133,7 +134,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = @@ -185,7 +186,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = @@ -239,7 +240,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc index 8511864d5fc72..2b96fb98f442b 100644 --- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc +++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc @@ -11,6 +11,7 @@ #include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkSize.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" #include #include @@ -83,7 +84,7 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin @@ -136,7 +137,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc index 35cdf42828a63..62ee41f3aa68d 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc @@ -9,6 +9,7 @@ #include "flutter/fml/logging.h" #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { @@ -29,7 +30,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc index f92b7cc21e4d0..4c343bcf68054 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc @@ -9,6 +9,7 @@ #include "flutter/fml/logging.h" #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { @@ -29,7 +30,7 @@ bool EmbedderTestCompositorMetal::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc index c0df97a5f606c..99a648422fe71 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc @@ -10,6 +10,7 @@ #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h" #include "third_party/skia/include/core/SkSurface.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { @@ -30,7 +31,7 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition( sk_sp surface = SkSurface::MakeRenderTarget(context_.get(), // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_unittests_util.cc b/shell/platform/embedder/tests/embedder_unittests_util.cc index d6e9236379280..3dc8d8281a153 100644 --- a/shell/platform/embedder/tests/embedder_unittests_util.cc +++ b/shell/platform/embedder/tests/embedder_unittests_util.cc @@ -9,6 +9,7 @@ #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h" #include "flutter/shell/platform/embedder/tests/embedder_unittests_util.h" +#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { @@ -19,7 +20,7 @@ sk_sp CreateRenderSurface(const FlutterLayer& layer, SkImageInfo::MakeN32Premul(layer.size.width, layer.size.height); auto surface = context ? SkSurface::MakeRenderTarget( context, // context - SkBudgeted::kNo, // budgeted + skgpu:Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin From e271514504b66fdbc231f4c4de96c22018ff3de8 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 10:35:33 -0500 Subject: [PATCH 2/5] colon --- display_list/display_list_benchmarks_gl.cc | 4 ++-- flow/layers/offscreen_surface.cc | 2 +- flow/raster_cache.cc | 2 +- lib/ui/painting/image_encoding_impl.h | 2 +- shell/common/rasterizer_unittests.cc | 2 +- shell/common/shell_test_platform_view_vulkan.cc | 2 +- shell/common/snapshot_controller_skia.cc | 2 +- .../Source/FlutterEmbedderExternalTextureTest.mm | 8 ++++---- .../embedder/tests/embedder_test_backingstore_producer.cc | 4 ++-- .../embedder/tests/embedder_test_compositor_gl.cc | 2 +- .../embedder/tests/embedder_test_compositor_metal.cc | 2 +- .../embedder/tests/embedder_test_compositor_vulkan.cc | 2 +- shell/platform/embedder/tests/embedder_unittests_util.cc | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/display_list/display_list_benchmarks_gl.cc b/display_list/display_list_benchmarks_gl.cc index 7762860694537..db9cde13718a3 100644 --- a/display_list/display_list_benchmarks_gl.cc +++ b/display_list/display_list_benchmarks_gl.cc @@ -20,7 +20,7 @@ void OpenGLCanvasProvider::InitializeSurface(const size_t width, const auto image_info = SkImageInfo::MakeN32Premul(surface_size_); surface_ = SkSurface::MakeRenderTarget( - gl_surface_->GetGrContext().get(), skgpu:Budgeted::kNo, image_info, 1, + gl_surface_->GetGrContext().get(), skgpu::Budgeted::kNo, image_info, 1, kTopLeft_GrSurfaceOrigin, nullptr, false); surface_->getCanvas()->clear(SK_ColorTRANSPARENT); } @@ -39,7 +39,7 @@ sk_sp OpenGLCanvasProvider::MakeOffscreenSurface( const auto image_info = SkImageInfo::MakeN32Premul(surface_size_); auto offscreen_surface = SkSurface::MakeRenderTarget( - gl_surface_->GetGrContext().get(), skgpu:Budgeted::kNo, image_info, 1, + gl_surface_->GetGrContext().get(), skgpu::Budgeted::kNo, image_info, 1, kTopLeft_GrSurfaceOrigin, nullptr, false); offscreen_surface->getCanvas()->clear(SK_ColorTRANSPARENT); diff --git a/flow/layers/offscreen_surface.cc b/flow/layers/offscreen_surface.cc index 2b0f83d8bc57c..a80c33123c7f9 100644 --- a/flow/layers/offscreen_surface.cc +++ b/flow/layers/offscreen_surface.cc @@ -22,7 +22,7 @@ static sk_sp CreateSnapshotSurface(GrDirectContext* surface_context, // There is a rendering surface that may contain textures that are going to // be referenced in the layer tree about to be drawn. return SkSurface::MakeRenderTarget( - reinterpret_cast(surface_context), skgpu:Budgeted::kNo, + reinterpret_cast(surface_context), skgpu::Budgeted::kNo, image_info); } diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc index 8a9bcbd5a2403..78d95cdc56f0c 100644 --- a/flow/raster_cache.cc +++ b/flow/raster_cache.cc @@ -65,7 +65,7 @@ std::unique_ptr RasterCache::Rasterize( sk_sp surface = context.gr_context ? SkSurface::MakeRenderTarget( - context.gr_context, skgpu:Budgeted::kYes, image_info) + context.gr_context, skgpu::Budgeted::kYes, image_info) : SkSurface::MakeRaster(image_info); if (!surface) { diff --git a/lib/ui/painting/image_encoding_impl.h b/lib/ui/painting/image_encoding_impl.h index 8f832756dd54e..8df76b91966d2 100644 --- a/lib/ui/painting/image_encoding_impl.h +++ b/lib/ui/painting/image_encoding_impl.h @@ -29,7 +29,7 @@ sk_sp ConvertToRasterUsingResourceContext( .SetIfFalse([&surface, &surface_info, resource_context] { if (resource_context) { surface = SkSurface::MakeRenderTarget( - resource_context.get(), skgpu:Budgeted::kNo, surface_info); + resource_context.get(), skgpu::Budgeted::kNo, surface_info); } else { surface = SkSurface::MakeRaster(surface_info); } diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index 996958f53743a..13b71c4ec66f7 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -914,7 +914,7 @@ TEST(RasterizerTest, TeardownFreesResourceCache) { auto image_info = SkImageInfo::MakeN32Premul(500, 500, SkColorSpace::MakeSRGB()); auto sk_surface = - SkSurface::MakeRenderTarget(context.get(), skgpu:Budgeted::kYes, image_info); + SkSurface::MakeRenderTarget(context.get(), skgpu::Budgeted::kYes, image_info); EXPECT_TRUE(sk_surface); SkPaint paint; diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc index 27c0129017b66..8c6ad1cba88d1 100644 --- a/shell/common/shell_test_platform_view_vulkan.cc +++ b/shell/common/shell_test_platform_view_vulkan.cc @@ -194,7 +194,7 @@ ShellTestPlatformViewVulkan::OffScreenSurface::AcquireFrame( const SkISize& size) { auto image_info = SkImageInfo::Make(size, SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kOpaque_SkAlphaType); - auto surface = SkSurface::MakeRenderTarget(context_.get(), skgpu:Budgeted::kNo, + auto surface = SkSurface::MakeRenderTarget(context_.get(), skgpu::Budgeted::kNo, image_info, 0, nullptr); SurfaceFrame::SubmitCallback callback = [](const SurfaceFrame&, SkCanvas* canvas) -> bool { diff --git a/shell/common/snapshot_controller_skia.cc b/shell/common/snapshot_controller_skia.cc index ecf435ff95fc2..9fe0ea6201421 100644 --- a/shell/common/snapshot_controller_skia.cc +++ b/shell/common/snapshot_controller_skia.cc @@ -106,7 +106,7 @@ sk_sp SnapshotControllerSkia::DoMakeRasterSnapshot( // SkSurface because we want to access texture backed images. sk_sp sk_surface = SkSurface::MakeRenderTarget(context, // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info // image info ); if (!sk_surface) { diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm index 5488f0b39f7d3..b66b2519e328f 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm @@ -76,7 +76,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info)); // Create a texture. MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init]; @@ -134,7 +134,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = @@ -186,7 +186,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = @@ -240,7 +240,7 @@ - (CVPixelBufferRef)pixelBuffer { [[FlutterDarwinContextMetalSkia alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); - sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu:Budgeted::kNo, info)); + sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, skgpu::Budgeted::kNo, info)); // Create a texture. TestExternalTexture* testExternalTexture = diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc index 2b96fb98f442b..c55b04c0ba74e 100644 --- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc +++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc @@ -84,7 +84,7 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin @@ -137,7 +137,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc index 62ee41f3aa68d..2c9589b54b109 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc @@ -30,7 +30,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc index 4c343bcf68054..4452313adcb37 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc @@ -30,7 +30,7 @@ bool EmbedderTestCompositorMetal::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc index 99a648422fe71..8c6033fdc01df 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc @@ -31,7 +31,7 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition( sk_sp surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_unittests_util.cc b/shell/platform/embedder/tests/embedder_unittests_util.cc index 3dc8d8281a153..bb82fd60fd4c5 100644 --- a/shell/platform/embedder/tests/embedder_unittests_util.cc +++ b/shell/platform/embedder/tests/embedder_unittests_util.cc @@ -20,7 +20,7 @@ sk_sp CreateRenderSurface(const FlutterLayer& layer, SkImageInfo::MakeN32Premul(layer.size.width, layer.size.height); auto surface = context ? SkSurface::MakeRenderTarget( context, // context - skgpu:Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin From 0731a717f320eccd33488436718e820035f34d49 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 10:36:47 -0500 Subject: [PATCH 3/5] format --- flow/layers/offscreen_surface.cc | 4 ++-- flow/raster_cache.cc | 7 ++++--- shell/common/rasterizer_unittests.cc | 4 ++-- shell/common/shell_test_platform_view_vulkan.cc | 4 ++-- shell/common/snapshot_controller_skia.cc | 4 ++-- .../embedder/tests/embedder_test_backingstore_producer.cc | 4 ++-- .../platform/embedder/tests/embedder_test_compositor_gl.cc | 2 +- .../embedder/tests/embedder_test_compositor_metal.cc | 2 +- .../embedder/tests/embedder_test_compositor_vulkan.cc | 2 +- shell/platform/embedder/tests/embedder_unittests_util.cc | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/flow/layers/offscreen_surface.cc b/flow/layers/offscreen_surface.cc index a80c33123c7f9..d74079d608fa6 100644 --- a/flow/layers/offscreen_surface.cc +++ b/flow/layers/offscreen_surface.cc @@ -22,8 +22,8 @@ static sk_sp CreateSnapshotSurface(GrDirectContext* surface_context, // There is a rendering surface that may contain textures that are going to // be referenced in the layer tree about to be drawn. return SkSurface::MakeRenderTarget( - reinterpret_cast(surface_context), skgpu::Budgeted::kNo, - image_info); + reinterpret_cast(surface_context), + skgpu::Budgeted::kNo, image_info); } // There is no rendering surface, assume no GPU textures are present and diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc index 78d95cdc56f0c..bdb08d7bfac0c 100644 --- a/flow/raster_cache.cc +++ b/flow/raster_cache.cc @@ -64,9 +64,10 @@ std::unique_ptr RasterCache::Rasterize( sk_ref_sp(context.dst_color_space)); sk_sp surface = - context.gr_context ? SkSurface::MakeRenderTarget( - context.gr_context, skgpu::Budgeted::kYes, image_info) - : SkSurface::MakeRaster(image_info); + context.gr_context + ? SkSurface::MakeRenderTarget(context.gr_context, + skgpu::Budgeted::kYes, image_info) + : SkSurface::MakeRaster(image_info); if (!surface) { return nullptr; diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index 13b71c4ec66f7..99333d0dd1cae 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -913,8 +913,8 @@ TEST(RasterizerTest, TeardownFreesResourceCache) { auto image_info = SkImageInfo::MakeN32Premul(500, 500, SkColorSpace::MakeSRGB()); - auto sk_surface = - SkSurface::MakeRenderTarget(context.get(), skgpu::Budgeted::kYes, image_info); + auto sk_surface = SkSurface::MakeRenderTarget( + context.get(), skgpu::Budgeted::kYes, image_info); EXPECT_TRUE(sk_surface); SkPaint paint; diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc index 8c6ad1cba88d1..051775ae9a58f 100644 --- a/shell/common/shell_test_platform_view_vulkan.cc +++ b/shell/common/shell_test_platform_view_vulkan.cc @@ -194,8 +194,8 @@ ShellTestPlatformViewVulkan::OffScreenSurface::AcquireFrame( const SkISize& size) { auto image_info = SkImageInfo::Make(size, SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kOpaque_SkAlphaType); - auto surface = SkSurface::MakeRenderTarget(context_.get(), skgpu::Budgeted::kNo, - image_info, 0, nullptr); + auto surface = SkSurface::MakeRenderTarget( + context_.get(), skgpu::Budgeted::kNo, image_info, 0, nullptr); SurfaceFrame::SubmitCallback callback = [](const SurfaceFrame&, SkCanvas* canvas) -> bool { canvas->flush(); diff --git a/shell/common/snapshot_controller_skia.cc b/shell/common/snapshot_controller_skia.cc index 9fe0ea6201421..6f43befefc533 100644 --- a/shell/common/snapshot_controller_skia.cc +++ b/shell/common/snapshot_controller_skia.cc @@ -105,9 +105,9 @@ sk_sp SnapshotControllerSkia::DoMakeRasterSnapshot( // When there is an on screen surface, we need a render target // SkSurface because we want to access texture backed images. sk_sp sk_surface = - SkSurface::MakeRenderTarget(context, // context + SkSurface::MakeRenderTarget(context, // context skgpu::Budgeted::kNo, // budgeted - image_info // image info + image_info // image info ); if (!sk_surface) { FML_LOG(ERROR) diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc index c55b04c0ba74e..4e8a000e64fef 100644 --- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc +++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc @@ -84,7 +84,7 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin @@ -137,7 +137,7 @@ bool EmbedderTestBackingStoreProducer::CreateTexture( auto surface = SkSurface::MakeRenderTarget( context_.get(), // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kBottomLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc index 2c9589b54b109..d170403472aa7 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc @@ -30,7 +30,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc index 4452313adcb37..f3faaa30bfe98 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc @@ -30,7 +30,7 @@ bool EmbedderTestCompositorMetal::UpdateOffscrenComposition( auto surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc index 8c6033fdc01df..6c71ad32f6467 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc @@ -31,7 +31,7 @@ bool EmbedderTestCompositorVulkan::UpdateOffscrenComposition( sk_sp surface = SkSurface::MakeRenderTarget(context_.get(), // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin diff --git a/shell/platform/embedder/tests/embedder_unittests_util.cc b/shell/platform/embedder/tests/embedder_unittests_util.cc index bb82fd60fd4c5..7d0c04101e882 100644 --- a/shell/platform/embedder/tests/embedder_unittests_util.cc +++ b/shell/platform/embedder/tests/embedder_unittests_util.cc @@ -20,7 +20,7 @@ sk_sp CreateRenderSurface(const FlutterLayer& layer, SkImageInfo::MakeN32Premul(layer.size.width, layer.size.height); auto surface = context ? SkSurface::MakeRenderTarget( context, // context - skgpu::Budgeted::kNo, // budgeted + skgpu::Budgeted::kNo, // budgeted image_info, // image info 1, // sample count kTopLeft_GrSurfaceOrigin, // surface origin From cd09d34cab0ad6e9862b45fbecabede76abbf31b Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 15:07:21 -0500 Subject: [PATCH 4/5] fix GN rules --- flow/BUILD.gn | 1 + lib/ui/BUILD.gn | 1 + shell/common/BUILD.gn | 1 + 3 files changed, 3 insertions(+) diff --git a/flow/BUILD.gn b/flow/BUILD.gn index 09ed594157cab..70acd7817a5c4 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -95,6 +95,7 @@ source_set("flow") { "//flutter/common/graphics", "//flutter/fml", "//third_party/skia", + "//third_party/skia:gpu_shared", ] public_deps = [ "//flutter/display_list" ] diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 9048897a15ff1..fe17efe74d585 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -161,6 +161,7 @@ source_set("ui") { "//third_party/dart/runtime/bin:dart_io_api", "//third_party/rapidjson", "//third_party/skia", + "//third_party/skia:gpu_shared", ] if (impeller_supports_rendering) { diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index 7fa0c1b23ae70..fd03c01f7511e 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -138,6 +138,7 @@ source_set("common") { "//flutter/shell/profiling", "//third_party/dart/runtime:dart_api", "//third_party/skia", + "//third_party/skia:gpu_shared", ] if (impeller_supports_rendering) { From 542af7eb6aac1f8f83fc9e58772ffdf7448de734 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 5 Jan 2023 15:23:22 -0500 Subject: [PATCH 5/5] undo includes --- display_list/display_list_benchmarks_gl.cc | 1 - flow/BUILD.gn | 1 - flow/layers/offscreen_surface.cc | 1 - flow/raster_cache.cc | 1 - lib/ui/BUILD.gn | 1 - lib/ui/painting/image_encoding_impl.h | 1 - shell/common/BUILD.gn | 1 - shell/common/snapshot_controller_skia.cc | 1 - .../macos/framework/Source/FlutterEmbedderExternalTextureTest.mm | 1 - .../embedder/tests/embedder_test_backingstore_producer.cc | 1 - shell/platform/embedder/tests/embedder_test_compositor_gl.cc | 1 - shell/platform/embedder/tests/embedder_test_compositor_metal.cc | 1 - shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc | 1 - shell/platform/embedder/tests/embedder_unittests_util.cc | 1 - 14 files changed, 14 deletions(-) diff --git a/display_list/display_list_benchmarks_gl.cc b/display_list/display_list_benchmarks_gl.cc index db9cde13718a3..a86a27dbd48e9 100644 --- a/display_list/display_list_benchmarks_gl.cc +++ b/display_list/display_list_benchmarks_gl.cc @@ -6,7 +6,6 @@ #include "flutter/display_list/display_list_benchmarks.h" #include "third_party/skia/include/core/SkCanvas.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { diff --git a/flow/BUILD.gn b/flow/BUILD.gn index 70acd7817a5c4..09ed594157cab 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -95,7 +95,6 @@ source_set("flow") { "//flutter/common/graphics", "//flutter/fml", "//third_party/skia", - "//third_party/skia:gpu_shared", ] public_deps = [ "//flutter/display_list" ] diff --git a/flow/layers/offscreen_surface.cc b/flow/layers/offscreen_surface.cc index d74079d608fa6..95516098603a9 100644 --- a/flow/layers/offscreen_surface.cc +++ b/flow/layers/offscreen_surface.cc @@ -9,7 +9,6 @@ #include "third_party/skia/include/core/SkSerialProcs.h" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/core/SkSurfaceCharacterization.h" -#include "third_party/skia/include/gpu/GpuTypes.h" #include "third_party/skia/include/utils/SkBase64.h" namespace flutter { diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc index bdb08d7bfac0c..9eb420f3b7a94 100644 --- a/flow/raster_cache.cc +++ b/flow/raster_cache.cc @@ -19,7 +19,6 @@ #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkPicture.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" #include "third_party/skia/include/gpu/GrDirectContext.h" namespace flutter { diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index fe17efe74d585..9048897a15ff1 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -161,7 +161,6 @@ source_set("ui") { "//third_party/dart/runtime/bin:dart_io_api", "//third_party/rapidjson", "//third_party/skia", - "//third_party/skia:gpu_shared", ] if (impeller_supports_rendering) { diff --git a/lib/ui/painting/image_encoding_impl.h b/lib/ui/painting/image_encoding_impl.h index 8df76b91966d2..b467fc82eeb5d 100644 --- a/lib/ui/painting/image_encoding_impl.h +++ b/lib/ui/painting/image_encoding_impl.h @@ -9,7 +9,6 @@ #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index fd03c01f7511e..7fa0c1b23ae70 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -138,7 +138,6 @@ source_set("common") { "//flutter/shell/profiling", "//third_party/dart/runtime:dart_api", "//third_party/skia", - "//third_party/skia:gpu_shared", ] if (impeller_supports_rendering) { diff --git a/shell/common/snapshot_controller_skia.cc b/shell/common/snapshot_controller_skia.cc index 6f43befefc533..27b67008e417d 100644 --- a/shell/common/snapshot_controller_skia.cc +++ b/shell/common/snapshot_controller_skia.cc @@ -9,7 +9,6 @@ #include "flutter/fml/trace_event.h" #include "flutter/shell/common/snapshot_controller.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm index b66b2519e328f..55a6ade04a6f6 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm @@ -18,7 +18,6 @@ #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSamplingOptions.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" @interface TestExternalTexture : NSObject diff --git a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc index 4e8a000e64fef..f4357b73b3acd 100644 --- a/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc +++ b/shell/platform/embedder/tests/embedder_test_backingstore_producer.cc @@ -11,7 +11,6 @@ #include "third_party/skia/include/core/SkImageInfo.h" #include "third_party/skia/include/core/SkSize.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" #include #include diff --git a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc index d170403472aa7..2b9d946628954 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_gl.cc @@ -9,7 +9,6 @@ #include "flutter/fml/logging.h" #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { diff --git a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc index f3faaa30bfe98..ab3ae36ae6809 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_metal.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_metal.cc @@ -9,7 +9,6 @@ #include "flutter/fml/logging.h" #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { diff --git a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc index 6c71ad32f6467..76ac5ddb94fa2 100644 --- a/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc +++ b/shell/platform/embedder/tests/embedder_test_compositor_vulkan.cc @@ -10,7 +10,6 @@ #include "flutter/shell/platform/embedder/tests/embedder_assertions.h" #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h" #include "third_party/skia/include/core/SkSurface.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing { diff --git a/shell/platform/embedder/tests/embedder_unittests_util.cc b/shell/platform/embedder/tests/embedder_unittests_util.cc index 7d0c04101e882..474091922d931 100644 --- a/shell/platform/embedder/tests/embedder_unittests_util.cc +++ b/shell/platform/embedder/tests/embedder_unittests_util.cc @@ -9,7 +9,6 @@ #include "flutter/shell/platform/embedder/tests/embedder_test_backingstore_producer.h" #include "flutter/shell/platform/embedder/tests/embedder_unittests_util.h" -#include "third_party/skia/include/gpu/GpuTypes.h" namespace flutter { namespace testing {