Remove a ctor from SkAutoGlyphCache; removal continues.

This change SkAutoGlyphCache with one remaining ctor, then
it's time to remove SkAutoGlyphCacheNoGamma, which is used
but Android.

Change-Id: I0f75ccb4139700d0b678492173f50ac0580d20cd
Reviewed-on: https://skia-review.googlesource.com/115007
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>

2 files changed, 10 insertions, 12 deletions

diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index 603f923eff..eda0d259db 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -295,24 +295,20 @@ public:
         : INHERITED(SkGlyphCache::FindOrCreateStrikeExclusive(
             paint, surfaceProps, SkScalerContextFlags::kFakeGammaAndBoostContrast, matrix)) {}
 
-    SkAutoGlyphCache(const SkPaint& paint,
-                     const SkSurfaceProps* surfaceProps,
-                     SkScalerContextFlags scalerContextFlags,
-                     const SkMatrix* matrix)
-        : INHERITED(SkGlyphCache::FindOrCreateStrikeExclusive(
-                paint, surfaceProps, scalerContextFlags, matrix)) {}
-
 private:
     using INHERITED = SkExclusiveStrikePtr;
 };
 
-class SkAutoGlyphCacheNoGamma : public SkAutoGlyphCache {
+class SkAutoGlyphCacheNoGamma : public SkExclusiveStrikePtr {
 public:
     SkAutoGlyphCacheNoGamma(const SkPaint& paint,
                             const SkSurfaceProps* surfaceProps,
                             const SkMatrix* matrix)
-        : SkAutoGlyphCache(paint, surfaceProps, SkScalerContextFlags::kNone, matrix)
-    {}
+        : INHERITED(SkGlyphCache::FindOrCreateStrikeExclusive(
+            paint, surfaceProps, SkScalerContextFlags::kNone, matrix)) {}
+
+private:
+    using INHERITED = SkExclusiveStrikePtr;
 };
 #define SkAutoGlyphCache(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCache)
 #define SkAutoGlyphCacheNoGamma(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCacheNoGamma)
diff --git a/src/core/SkOverdrawCanvas.cpp b/src/core/SkOverdrawCanvas.cpp
index 78eb1cb866..eee7d83afb 100644
--- a/src/core/SkOverdrawCanvas.cpp
+++ b/src/core/SkOverdrawCanvas.cpp
@@ -63,7 +63,8 @@ void SkOverdrawCanvas::onDrawText(const void* text, size_t byteLength, SkScalar
     ProcessOneGlyphBounds processBounds(this);
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
     this->getProps(&props);
-    SkAutoGlyphCache cache(paint, &props, SkScalerContextFlags::kNone, &this->getTotalMatrix());
+    auto cache = SkGlyphCache::FindOrCreateStrikeExclusive(
+            paint, &props, SkScalerContextFlags::kNone, &this->getTotalMatrix());
     SkFindAndPlaceGlyph::ProcessText(paint.getTextEncoding(), (const char*) text, byteLength,
                                      SkPoint::Make(x, y), SkMatrix(), paint.getTextAlign(),
                                      cache.get(), processBounds);
@@ -75,7 +76,8 @@ void SkOverdrawCanvas::drawPosTextCommon(const void* text, size_t byteLength, co
     ProcessOneGlyphBounds processBounds(this);
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
     this->getProps(&props);
-    SkAutoGlyphCache cache(paint, &props, SkScalerContextFlags::kNone, &this->getTotalMatrix());
+    auto cache = SkGlyphCache::FindOrCreateStrikeExclusive(
+            paint, &props, SkScalerContextFlags::kNone, &this->getTotalMatrix());
     SkFindAndPlaceGlyph::ProcessPosText(paint.getTextEncoding(), (const char*) text, byteLength,
                                         SkPoint::Make(0, 0), SkMatrix(), (const SkScalar*) pos, 2,
                                         paint.getTextAlign(), cache.get(), processBounds);