commit 46eb3ab80de76a4a987dd7bb9c2fc628cb074eaa
author Robert Phillips <robertphillips@google.com> Mon Aug 02 17:09:01 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 03 16:07:22 2021 +0000
tree 7925499826186613668af9109f69ac7fe9ba0d63
parent caa760e214c8bc85f7e496d11d18671e4fc77720

Make v1/SurfaceDrawContext V1-only

The GrFillRectOp and GrTextureOp guards are temporary - just until they are made V1-only.

The SkGlyphRunPainter and GrTextBlob guards are going to linger since both will probably exist in both versions.

The GrTextBlob guards mainly hide the draw and makeAtlasTextOp methods.

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

gn/gpu.gni

diff --git a/gn/gpu.gni b/gn/gpu.gni
index 26baffc..774e125 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -482,10 +482,6 @@
   "$_src/image/SkImage_GpuYUVA.h",
   "$_src/image/SkSurface_Gpu.cpp",
   "$_src/image/SkSurface_Gpu.h",
-
-  # V1 files temporarily here
-  "$_src/gpu/v1/SurfaceDrawContext.cpp",
-  "$_src/gpu/v1/SurfaceDrawContext_v1.h",
 ]
 
 skia_gl_gpu_sources = [
@@ -601,6 +597,8 @@
   "$_src/gpu/v1/Device.cpp",
   "$_src/gpu/v1/Device_drawTexture.cpp",
   "$_src/gpu/v1/Device_v1.h",
+  "$_src/gpu/v1/SurfaceDrawContext.cpp",
+  "$_src/gpu/v1/SurfaceDrawContext_v1.h",
 ]
 
 skia_gpu_sources += skia_skgpu_v1_sources