commit af844c79d5358fd51a7f2fb439324cfd7f0798c1
author Robert Phillips <robertphillips@google.com> Wed Aug 04 09:50:17 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Aug 04 14:30:10 2021 +0000
tree 13e445eead7c6cf04540b7ac1f5212800de0f9b3
parent f0ffd41897426c7ce5f62dc01e4c0de7f5924b7d

Fission GrSurfaceFillContext into skgpu:: and skgpu::v1:: versions

The only really interesting parts are:
  src/gpu/SurfaceFillContext.*
  src/gpu/v1/SurfaceFillContext.*

Everything else is mostly mechanical.

Bug: skia:11837
Change-Id: If2945f30dadd6ad0cccf6ff2b53e4a92b1dc6cbc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436099
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/BaseDevice.h

diff --git a/src/gpu/BaseDevice.h b/src/gpu/BaseDevice.h
index 4ed6406..8c6a60c 100644
--- a/src/gpu/BaseDevice.h
+++ b/src/gpu/BaseDevice.h
@@ -12,8 +12,12 @@
 #include "include/private/GrTypesPriv.h"
 
 class GrRenderTargetProxy;
-namespace skgpu { namespace v1 { class SurfaceDrawContext; }}
-class GrSurfaceFillContext;
+namespace skgpu {
+    class SurfaceFillContext;
+#if SK_GPU_V1
+    namespace v1 { class SurfaceDrawContext; }
+#endif // SK_GPU_V1
+}
 class GrSurfaceProxyView;
 
 // NOTE: when not defined, SkGpuDevice extends SkBaseDevice directly and manages its clip stack
@@ -53,7 +57,7 @@
     virtual skgpu::v1::SurfaceDrawContext* surfaceDrawContext() { return nullptr; }
 #endif
 
-    virtual GrSurfaceFillContext* surfaceFillContext() = 0;
+    virtual skgpu::SurfaceFillContext* surfaceFillContext() = 0;
     GrRenderTargetProxy* targetProxy();
     GrRecordingContext* recordingContext() const { return fContext.get(); }