commit de60d7a64dba5b3e83500a7b5fce8f7edc6f4fc7
author Robert Phillips <robertphillips@google.com> Mon Sep 13 17:17:45 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Sep 15 15:20:24 2021 +0000
tree b8c86590786b2314d0c034bea5a1040bd9db0749
parent fd1332f5a747bdd1de56ab5bfa3372b921f02159

Move more classes to skgpu::v1 namespace

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

src/gpu/GrDirectContext.cpp

diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 4ada100..cc410a3 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -29,14 +29,16 @@
 #include "src/gpu/text/GrStrikeCache.h"
 #include "src/image/SkImage_GpuBase.h"
 #if SK_GPU_V1
-#include "src/gpu/ops/GrSmallPathAtlasMgr.h"
+#include "src/gpu/ops/SmallPathAtlasMgr.h"
 #else
 // A vestigial definition for v2 that will never be instantiated
-class GrSmallPathAtlasMgr {
+namespace skgpu::v1 {
+class SmallPathAtlasMgr {
 public:
-    GrSmallPathAtlasMgr() { SkASSERT(0); }
+    SmallPathAtlasMgr() { SkASSERT(0); }
     void reset() { SkASSERT(0); }
 };
+}
 #endif
 #ifdef SK_METAL
 #include "include/gpu/mtl/GrMtlBackendContext.h"
@@ -374,10 +376,10 @@
     return true;
 }
 
-GrSmallPathAtlasMgr* GrDirectContext::onGetSmallPathAtlasMgr() {
+skgpu::v1::SmallPathAtlasMgr* GrDirectContext::onGetSmallPathAtlasMgr() {
 #if SK_GPU_V1
     if (!fSmallPathAtlasMgr) {
-        fSmallPathAtlasMgr = std::make_unique<GrSmallPathAtlasMgr>();
+        fSmallPathAtlasMgr = std::make_unique<skgpu::v1::SmallPathAtlasMgr>();
 
         this->priv().addOnFlushCallbackObject(fSmallPathAtlasMgr.get());
     }