Pull non-substantive changes out of omnibus CL

These come from: https://skia-review.googlesource.com/c/skia/+/108001 (Fission GrAtlasGlyphCache in two)

Bug: skia:
Change-Id: Ife15cad018f9ddedec578fcd6aa07da00a77196e
Reviewed-on: https://skia-review.googlesource.com/109026
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

4 files changed, 20 insertions, 16 deletions

diff --git a/src/atlastext/SkInternalAtlasTextContext.h b/src/atlastext/SkInternalAtlasTextContext.h
index 49a55cce15..cdba3ad8b0 100644
--- a/src/atlastext/SkInternalAtlasTextContext.h
+++ b/src/atlastext/SkInternalAtlasTextContext.h
@@ -13,12 +13,13 @@
 #include "SkArenaAllocList.h"
 #include "SkRefCnt.h"
 
-class SkAtlasTextRenderer;
-class SkMatrix;
-class GrContext;
 class GrAtlasGlyphCache;
+class GrContext;
 class GrTextBlobCache;
 
+class SkAtlasTextRenderer;
+class SkMatrix;
+
 /**
  * The implementation of SkAtlasTextContext. This exists to hide the details from the public class.
  * and to be able to use other private types.
diff --git a/src/gpu/GrDistanceFieldGenFromVector.h b/src/gpu/GrDistanceFieldGenFromVector.h
index 48a0784229..cadc33a162 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.h
+++ b/src/gpu/GrDistanceFieldGenFromVector.h
@@ -32,7 +32,7 @@ bool GrGenerateDistanceFieldFromPath(unsigned char* distanceField,
 
 inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
 {
-	return (SkPath::kEvenOdd_FillType == fFillType ||
+    return (SkPath::kEvenOdd_FillType == fFillType ||
             SkPath::kInverseEvenOdd_FillType == fFillType);
 }
 
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 8a4c50c0d6..46f38099ec 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "GrAtlasTextOp.h"
+
 #include "GrContext.h"
 #include "GrOpFlushState.h"
 #include "GrResourceProvider.h"
@@ -49,6 +50,19 @@ void GrAtlasTextOp::init() {
     }
 }
 
+void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func) const {
+    fProcessors.visitProxies(func);
+
+    unsigned int numProxies;
+    const sk_sp<GrTextureProxy>* proxies = fFontCache->getProxies(this->maskFormat(),
+                                                                  &numProxies);
+    for (unsigned int i = 0; i < numProxies; ++i) {
+        if (proxies[i]) {
+            func(proxies[i].get());
+        }
+    }
+}
+
 SkString GrAtlasTextOp::dumpInfo() const {
     SkString str;
 
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index de6f176d15..dbdce387ec 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -92,18 +92,7 @@ public:
 
     const char* name() const override { return "AtlasTextOp"; }
 
-    void visitProxies(const VisitProxyFunc& func) const override {
-        fProcessors.visitProxies(func);
-
-        unsigned int numProxies;
-        const sk_sp<GrTextureProxy>* proxies = fFontCache->getProxies(this->maskFormat(),
-                                                                      &numProxies);
-        for (unsigned int i = 0; i < numProxies; ++i) {
-            if (proxies[i]) {
-                func(proxies[i].get());
-            }
-        }
-    }
+    void visitProxies(const VisitProxyFunc& func) const override;
 
     SkString dumpInfo() const override;