Rename //flutter/shell/gpu to //flutter/shell/surface.

BUILD.gn

@@ -216,9 +216,9 @@ group("unittests") {
     if (is_mac) {
       public_deps += [
         "//flutter/impeller/golden_tests:impeller_golden_tests",
-        "//flutter/shell/gpu:gpu_surface_metal_unittests",
         "//flutter/shell/platform/darwin/common:availability_version_check_unittests",
         "//flutter/shell/platform/darwin/common:framework_common_unittests",
+        "//flutter/shell/surface:metal_unittests",
         "//flutter/third_party/spring_animation:spring_animation_unittests",
       ]
     }

ci/licenses_golden/excluded_files

@@ -287,7 +287,6 @@
 ../../../flutter/shell/common/switches_unittests.cc
 ../../../flutter/shell/common/variable_refresh_rate_display_unittests.cc
 ../../../flutter/shell/common/vsync_waiter_unittests.cc
-../../../flutter/shell/gpu/gpu_surface_metal_impeller_unittests.mm
 ../../../flutter/shell/platform/android/.gitignore
 ../../../flutter/shell/platform/android/README.md
 ../../../flutter/shell/platform/android/android_context_gl_impeller_unittests.cc
@@ -421,6 +420,8 @@
 ../../../flutter/shell/platform/windows/window_unittests.cc
 ../../../flutter/shell/platform/windows/windows_lifecycle_manager_unittests.cc
 ../../../flutter/shell/profiling/sampling_profiler_unittest.cc
+../../../flutter/shell/surface/README.md
+../../../flutter/shell/surface/surface_metal_impeller_unittests.mm
 ../../../flutter/shell/testing
 ../../../flutter/shell/vmservice/.dart_tool
 ../../../flutter/shell/vmservice/pubspec.lock

ci/licenses_golden/licenses_flutter

@@ -43265,28 +43265,6 @@ ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.cc + ../../../flutte
 ORIGIN: ../../../flutter/shell/common/vsync_waiter_fallback.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/vsync_waiters_test.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_skia.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_gl_skia.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.mm + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_skia.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_metal_skia.mm + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software_delegate.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_software_delegate.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/android/AndroidManifest.xml + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_impeller.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/android/android_context_gl_impeller.h + ../../../flutter/LICENSE
@@ -44318,6 +44296,28 @@ ORIGIN: ../../../flutter/shell/platform/windows/windows_proc_table.h + ../../../
 ORIGIN: ../../../flutter/shell/platform/windows/windowsx_shim.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/profiling/sampling_profiler.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/profiling/sampling_profiler.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_skia.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_gl_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_impeller.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_skia.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_metal_skia.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_software.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_software.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_software_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_software_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan_delegate.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan_delegate.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan_impeller.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/surface/surface_vulkan_impeller.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/version/version.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/version/version.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/vmservice/empty.dart + ../../../flutter/LICENSE
@@ -46155,28 +46155,6 @@ FILE: ../../../flutter/shell/common/vsync_waiter_fallback.cc
 FILE: ../../../flutter/shell/common/vsync_waiter_fallback.h
 FILE: ../../../flutter/shell/common/vsync_waiters_test.cc
 FILE: ../../../flutter/shell/common/vsync_waiters_test.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_delegate.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_impeller.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_skia.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_gl_skia.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_delegate.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_impeller.mm
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_skia.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_metal_skia.mm
-FILE: ../../../flutter/shell/gpu/gpu_surface_software.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_software.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_software_delegate.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_software_delegate.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.cc
-FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_impeller.h
 FILE: ../../../flutter/shell/platform/android/AndroidManifest.xml
 FILE: ../../../flutter/shell/platform/android/android_context_gl_impeller.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl_impeller.h
@@ -47233,6 +47211,28 @@ FILE: ../../../flutter/shell/platform/windows/windows_proc_table.h
 FILE: ../../../flutter/shell/platform/windows/windowsx_shim.h
 FILE: ../../../flutter/shell/profiling/sampling_profiler.cc
 FILE: ../../../flutter/shell/profiling/sampling_profiler.h
+FILE: ../../../flutter/shell/surface/surface_gl_delegate.cc
+FILE: ../../../flutter/shell/surface/surface_gl_delegate.h
+FILE: ../../../flutter/shell/surface/surface_gl_impeller.cc
+FILE: ../../../flutter/shell/surface/surface_gl_impeller.h
+FILE: ../../../flutter/shell/surface/surface_gl_skia.cc
+FILE: ../../../flutter/shell/surface/surface_gl_skia.h
+FILE: ../../../flutter/shell/surface/surface_metal_delegate.cc
+FILE: ../../../flutter/shell/surface/surface_metal_delegate.h
+FILE: ../../../flutter/shell/surface/surface_metal_impeller.h
+FILE: ../../../flutter/shell/surface/surface_metal_impeller.mm
+FILE: ../../../flutter/shell/surface/surface_metal_skia.h
+FILE: ../../../flutter/shell/surface/surface_metal_skia.mm
+FILE: ../../../flutter/shell/surface/surface_software.cc
+FILE: ../../../flutter/shell/surface/surface_software.h
+FILE: ../../../flutter/shell/surface/surface_software_delegate.cc
+FILE: ../../../flutter/shell/surface/surface_software_delegate.h
+FILE: ../../../flutter/shell/surface/surface_vulkan.cc
+FILE: ../../../flutter/shell/surface/surface_vulkan.h
+FILE: ../../../flutter/shell/surface/surface_vulkan_delegate.cc
+FILE: ../../../flutter/shell/surface/surface_vulkan_delegate.h
+FILE: ../../../flutter/shell/surface/surface_vulkan_impeller.cc
+FILE: ../../../flutter/shell/surface/surface_vulkan_impeller.h
 FILE: ../../../flutter/shell/version/version.cc
 FILE: ../../../flutter/shell/version/version.h
 FILE: ../../../flutter/shell/vmservice/empty.dart

shell/common/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//flutter/common/config.gni")
 import("//flutter/impeller/tools/impeller.gni")
-import("//flutter/shell/gpu/gpu.gni")
+import("//flutter/shell/surface/surface.gni")
 import("//flutter/testing/testing.gni")
 
 if (is_fuchsia) {

shell/common/shell_test_platform_view_gl.cc

@@ -8,7 +8,7 @@
 
 #include <EGL/egl.h>
 
-#include "flutter/shell/gpu/gpu_surface_gl_skia.h"
+#include "flutter/shell/surface/surface_gl_skia.h"
 #include "impeller/entity/gles/entity_shaders_gles.h"
 
 #if IMPELLER_ENABLE_3D
@@ -73,7 +73,7 @@ void ShellTestPlatformViewGL::SimulateVSync() {
 
 // |PlatformView|
 std::unique_ptr<Surface> ShellTestPlatformViewGL::CreateRenderingSurface() {
-  return std::make_unique<GPUSurfaceGLSkia>(this, true);
+  return std::make_unique<SurfaceGLSkia>(this, true);
 }
 
 // |PlatformView|
@@ -114,8 +114,8 @@ GLFBOInfo ShellTestPlatformViewGL::GLContextFBO(GLFrameInfo frame_info) const {
 }
 
 // |GPUSurfaceGLDelegate|
-GPUSurfaceGLDelegate::GLProcResolver
-ShellTestPlatformViewGL::GetGLProcResolver() const {
+SurfaceGLDelegate::GLProcResolver ShellTestPlatformViewGL::GetGLProcResolver()
+    const {
   return [surface = &gl_surface_](const char* name) -> void* {
     return surface->GetProcAddress(name);
   };

shell/common/shell_test_platform_view_gl.h

@@ -7,15 +7,15 @@
 
 #include "flutter/shell/common/shell_test_external_view_embedder.h"
 #include "flutter/shell/common/shell_test_platform_view.h"
-#include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
+#include "flutter/shell/surface/surface_gl_delegate.h"
 #include "flutter/testing/test_gl_surface.h"
 #include "impeller/renderer/backend/gles/context_gles.h"
 
 namespace flutter {
 namespace testing {
 
 class ShellTestPlatformViewGL : public ShellTestPlatformView,
-                                public GPUSurfaceGLDelegate {
+                                public SurfaceGLDelegate {
  public:
   ShellTestPlatformViewGL(PlatformView::Delegate& delegate,
                           const TaskRunners& task_runners,

shell/common/shell_test_platform_view_metal.h

@@ -7,15 +7,15 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/shell/common/shell_test_platform_view.h"
-#include "flutter/shell/gpu/gpu_surface_metal_delegate.h"
+#include "flutter/shell/surface/surface_metal_delegate.h"
 
 namespace flutter {
 namespace testing {
 
 class DarwinContextMetal;
 
 class ShellTestPlatformViewMetal final : public ShellTestPlatformView,
-                                         public GPUSurfaceMetalDelegate {
+                                         public SurfaceMetalDelegate {
  public:
   ShellTestPlatformViewMetal(PlatformView::Delegate& delegate,
                              const TaskRunners& task_runners,

shell/common/shell_test_platform_view_metal.mm

@@ -9,10 +9,10 @@
 #include <utility>
 
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
-#include "flutter/shell/gpu/gpu_surface_metal_impeller.h"
-#include "flutter/shell/gpu/gpu_surface_metal_skia.h"
 #include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalImpeller.h"
 #include "flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetalSkia.h"
+#include "flutter/shell/surface/surface_metal_impeller.h"
+#include "flutter/shell/surface/surface_metal_skia.h"
 
 namespace flutter {
 namespace testing {
@@ -74,7 +74,7 @@ GPUMTLTextureInfo offscreen_texture_info() const {
     std::shared_ptr<ShellTestExternalViewEmbedder> shell_test_external_view_embedder,
     const std::shared_ptr<const fml::SyncSwitch>& is_gpu_disabled_sync_switch)
     : ShellTestPlatformView(delegate, task_runners),
-      GPUSurfaceMetalDelegate(MTLRenderTargetType::kMTLTexture),
+      SurfaceMetalDelegate(MTLRenderTargetType::kMTLTexture),
       metal_context_(std::make_unique<DarwinContextMetal>(GetSettings().enable_impeller,
                                                           is_gpu_disabled_sync_switch)),
       create_vsync_waiter_(std::move(create_vsync_waiter)),
@@ -113,10 +113,10 @@ GPUMTLTextureInfo offscreen_texture_info() const {
 // |PlatformView|
 std::unique_ptr<Surface> ShellTestPlatformViewMetal::CreateRenderingSurface() {
   if (GetSettings().enable_impeller) {
-    return std::make_unique<GPUSurfaceMetalImpeller>(this,
-                                                     [metal_context_->impeller_context() context]);
+    return std::make_unique<SurfaceMetalImpeller>(this,
+                                                  [metal_context_->impeller_context() context]);
   }
-  return std::make_unique<GPUSurfaceMetalSkia>(this, [metal_context_->context() mainContext]);
+  return std::make_unique<SurfaceMetalSkia>(this, [metal_context_->context() mainContext]);
 }
 
 // |PlatformView|

shell/common/shell_test_platform_view_vulkan.h

@@ -7,7 +7,7 @@
 
 #include "flutter/shell/common/shell_test_external_view_embedder.h"
 #include "flutter/shell/common/shell_test_platform_view.h"
-#include "flutter/shell/gpu/gpu_surface_vulkan_delegate.h"
+#include "flutter/shell/surface/surface_vulkan_delegate.h"
 #include "flutter/vulkan/vulkan_application.h"
 #include "flutter/vulkan/vulkan_device.h"
 #include "flutter/vulkan/vulkan_skia_proc_table.h"

shell/platform/android/BUILD.gn

@@ -9,7 +9,7 @@ import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
 import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/config.gni")
-import("//flutter/shell/gpu/gpu.gni")
+import("//flutter/shell/surface/surface.gni")
 import("//flutter/shell/version/version.gni")
 import("//flutter/vulkan/config.gni")
 

shell/platform/android/android_surface_gl_impeller.cc

@@ -6,7 +6,7 @@
 
 #include "flutter/fml/logging.h"
 #include "flutter/impeller/toolkit/egl/surface.h"
-#include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
+#include "flutter/shell/surface/surface_gl_impeller.h"
 
 namespace flutter {
 
@@ -35,7 +35,7 @@ bool AndroidSurfaceGLImpeller::IsValid() const {
 // |AndroidSurface|
 std::unique_ptr<Surface> AndroidSurfaceGLImpeller::CreateGPUSurface(
     GrDirectContext* gr_context) {
-  auto surface = std::make_unique<GPUSurfaceGLImpeller>(
+  auto surface = std::make_unique<SurfaceGLImpeller>(
       this,                                    // delegate
       android_context_->GetImpellerContext(),  // context
       true                                     // render to surface

shell/platform/android/android_surface_gl_impeller.h

@@ -7,14 +7,14 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/impeller/renderer/context.h"
-#include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
 #include "flutter/shell/platform/android/android_context_gl_impeller.h"
 #include "flutter/shell/platform/android/surface/android_native_window.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
+#include "flutter/shell/surface/surface_gl_delegate.h"
 
 namespace flutter {
 
-class AndroidSurfaceGLImpeller final : public GPUSurfaceGLDelegate,
+class AndroidSurfaceGLImpeller final : public SurfaceGLDelegate,
                                        public AndroidSurface {
  public:
   explicit AndroidSurfaceGLImpeller(

shell/platform/android/android_surface_gl_skia.cc

@@ -50,16 +50,15 @@ bool AndroidSurfaceGLSkia::IsValid() const {
 std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateGPUSurface(
     GrDirectContext* gr_context) {
   if (gr_context) {
-    return std::make_unique<GPUSurfaceGLSkia>(sk_ref_sp(gr_context), this,
-                                              true);
+    return std::make_unique<SurfaceGLSkia>(sk_ref_sp(gr_context), this, true);
   } else {
     sk_sp<GrDirectContext> main_skia_context =
         android_context_->GetMainSkiaContext();
     if (!main_skia_context) {
-      main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
+      main_skia_context = SurfaceGLSkia::MakeGLContext(this);
       android_context_->SetMainSkiaContext(main_skia_context);
     }
-    return std::make_unique<GPUSurfaceGLSkia>(main_skia_context, this, true);
+    return std::make_unique<SurfaceGLSkia>(main_skia_context, this, true);
   }
 }
 
@@ -200,7 +199,7 @@ sk_sp<const GrGLInterface> AndroidSurfaceGLSkia::GetGLInterface() const {
     }
   }
 
-  return GPUSurfaceGLDelegate::GetGLInterface();
+  return SurfaceGLDelegate::GetGLInterface();
 }
 
 std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateSnapshotSurface() {
@@ -210,11 +209,11 @@ std::unique_ptr<Surface> AndroidSurfaceGLSkia::CreateSnapshotSurface() {
   sk_sp<GrDirectContext> main_skia_context =
       android_context_->GetMainSkiaContext();
   if (!main_skia_context) {
-    main_skia_context = GPUSurfaceGLSkia::MakeGLContext(this);
+    main_skia_context = SurfaceGLSkia::MakeGLContext(this);
     android_context_->SetMainSkiaContext(main_skia_context);
   }
 
-  return std::make_unique<GPUSurfaceGLSkia>(main_skia_context, this, true);
+  return std::make_unique<SurfaceGLSkia>(main_skia_context, this, true);
 }
 
 }  // namespace flutter

shell/platform/android/android_surface_gl_skia.h

@@ -10,15 +10,15 @@
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "flutter/shell/gpu/gpu_surface_gl_skia.h"
 #include "flutter/shell/platform/android/android_context_gl_skia.h"
 #include "flutter/shell/platform/android/android_environment_gl.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
 #include "flutter/shell/platform/android/surface/android_surface.h"
+#include "flutter/shell/surface/surface_gl_skia.h"
 
 namespace flutter {
 
-class AndroidSurfaceGLSkia final : public GPUSurfaceGLDelegate,
+class AndroidSurfaceGLSkia final : public SurfaceGLDelegate,
                                    public AndroidSurface {
  public:
   explicit AndroidSurfaceGLSkia(

shell/platform/android/android_surface_software.cc

@@ -13,7 +13,6 @@
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "flutter/shell/platform/android/jni/platform_view_android_jni.h"
-
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
@@ -69,7 +68,7 @@ std::unique_ptr<Surface> AndroidSurfaceSoftware::CreateGPUSurface(
   }
 
   auto surface =
-      std::make_unique<GPUSurfaceSoftware>(this, true /* render to surface */);
+      std::make_unique<SurfaceSoftware>(this, true /* render to surface */);
 
   if (!surface->IsValid()) {
     return nullptr;