Clean up GrText-related headers a bit

GrGlyph.h in particular was a bit out of date

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

src/gpu/GrDrawOpAtlas.h

@@ -11,16 +11,19 @@
 #include <cmath>
 #include <vector>
 
-#include "include/core/SkSize.h"
-#include "src/core/SkGlyphRunPainter.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/private/SkTArray.h"
 #include "src/core/SkIPoint16.h"
 #include "src/core/SkTInternalLList.h"
-
+#include "src/gpu/GrDeferredUpload.h"
 #include "src/gpu/GrRectanizerSkyline.h"
-#include "src/gpu/ops/GrDrawOp.h"
+#include "src/gpu/GrSurfaceProxyView.h"
+#include "src/gpu/geometry/GrRect.h"
 
 class GrOnFlushResourceProvider;
-
+class GrProxyProvider;
+class GrResourceProvider;
+class GrTextureProxy;
 
 /**
  * This class manages one or more atlas textures on behalf of GrDrawOps. The draw ops that use the
@@ -51,7 +54,6 @@ class GrDrawOpAtlas {
 private:
     static constexpr auto kMaxMultitexturePages = 4;
 
-
 public:
     /** Is the atlas allowed to use more than one texture? */
     enum class AllowMultitexturing : bool { kNo, kYes };
@@ -75,7 +77,7 @@ public:
         std::array<uint16_t, 4> getUVs(int padding) const;
 
         // TODO: Remove the small path renderer's use of this for eviction
-        GrDrawOpAtlas::PlotLocator plotLocator() const { return fPlotLocator; }
+        PlotLocator plotLocator() const { return fPlotLocator; }
 
         uint32_t pageIndex() const {
             uint32_t pageIndex = fPlotLocator & 0xff;
@@ -97,8 +99,8 @@ public:
     private:
         friend class GrDrawOpAtlas;
 
-        GrDrawOpAtlas::PlotLocator fPlotLocator{GrDrawOpAtlas::kInvalidPlotLocator};
-        GrIRect16                  fRect{0, 0, 0, 0};
+        PlotLocator fPlotLocator{GrDrawOpAtlas::kInvalidPlotLocator};
+        GrIRect16   fRect{0, 0, 0, 0};
 
         // TODO: the inset to the actual data w/in 'fRect' could also be stored in this class
         // This would simplify the 'getUVs' call. The valid values would be 0, 1, 2 & 4.

src/gpu/GrGlyph.h

@@ -8,13 +8,10 @@
 #ifndef GrGlyph_DEFINED
 #define GrGlyph_DEFINED
 
-#include "include/gpu/GrTypes.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/core/SkGlyph.h"
+#include "src/core/SkMask.h"
 #include "src/gpu/GrDrawOpAtlas.h"
-#include "src/gpu/geometry/GrRect.h"
-
-#include "include/core/SkPath.h"
-#include "include/private/SkChecksum.h"
-#include "include/private/SkFixed.h"
 
 class GrGlyph {
 public:

src/gpu/text/GrStrikeCache.cpp

@@ -5,16 +5,15 @@
  * found in the LICENSE file.
  */
 
-#include "src/gpu/GrCaps.h"
-#include "src/gpu/GrColor.h"
-#include "src/gpu/GrDistanceFieldGenFromVector.h"
-#include "src/gpu/text/GrAtlasManager.h"
-#include "src/gpu/text/GrStrikeCache.h"
-
+#include "src/codec/SkMasks.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkDistanceFieldGen.h"
 #include "src/core/SkStrikeSpec.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColor.h"
+#include "src/gpu/GrDistanceFieldGenFromVector.h"
+#include "src/gpu/text/GrAtlasManager.h"
 #include "src/gpu/text/GrStrikeCache.h"
 
 GrStrikeCache::~GrStrikeCache() {

src/gpu/text/GrStrikeCache.h

@@ -9,9 +9,7 @@
 #define GrStrikeCache_DEFINED
 
 #include "include/private/SkTHash.h"
-#include "src/codec/SkMasks.h"
 #include "src/core/SkDescriptor.h"
-#include "src/core/SkTDynamicHash.h"
 #include "src/gpu/GrDrawOpAtlas.h"
 #include "src/gpu/GrGlyph.h"
 

src/gpu/text/GrTextBlob.h

@@ -8,19 +8,23 @@
 #ifndef GrTextBlob_DEFINED
 #define GrTextBlob_DEFINED
 
+#include <limits>
+
 #include "include/core/SkPoint3.h"
-#include "src/core/SkDescriptor.h"
+#include "include/core/SkRefCnt.h"
+#include "src/core/SkGlyphRunPainter.h"
+#include "src/core/SkIPoint16.h"
 #include "src/core/SkMaskFilterBase.h"
 #include "src/core/SkOpts.h"
 #include "src/core/SkRectPriv.h"
 #include "src/core/SkStrikeSpec.h"
+#include "src/core/SkTLazy.h"
 #include "src/gpu/GrColor.h"
 #include "src/gpu/GrDrawOpAtlas.h"
 
-#include <limits>
-
 class GrAtlasManager;
 class GrAtlasTextOp;
+class GrDeferredUploadTarget;
 class GrGlyph;
 class GrStrikeCache;
 class GrTextContext;