Remove GrFontDescKey.

src/gpu/text/GrFontScaler.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrFontScaler.h"
 #include "SkDescriptor.h"
 #include "SkDistanceFieldGen.h"
 #include "SkGlyphCache.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrFontScaler::GrFontScaler(SkGlyphCache* strike) {
     fStrike = strike;
-    fKey = nullptr;
 }
 
-GrFontScaler::~GrFontScaler() {
-    SkSafeUnref(fKey);
-}
-
-GrMaskFormat GrFontScaler::getMaskFormat() const {
-    SkMask::Format format = fStrike->getMaskFormat();
-    switch (format) {
-        case SkMask::kBW_Format:
-            // fall through to kA8 -- we store BW glyphs in our 8-bit cache
-        case SkMask::kA8_Format:
-            return kA8_GrMaskFormat;
-        case SkMask::kLCD16_Format:
-            return kA565_GrMaskFormat;
-        case SkMask::kARGB32_Format:
-            return kARGB_GrMaskFormat;
-        default:
-            SkDEBUGFAIL("unsupported SkMask::Format");
-            return kA8_GrMaskFormat;
-    }
-}
-
-const GrFontDescKey* GrFontScaler::getKey() {
-    if (nullptr == fKey) {
-        fKey = new GrFontDescKey(fStrike->getDescriptor());
-    }
-    return fKey;
-}
+const SkDescriptor& GrFontScaler::getKey() { return fStrike->getDescriptor(); }
 
 GrMaskFormat GrFontScaler::getPackedGlyphMaskFormat(const SkGlyph& glyph) const {
     SkMask::Format format = static_cast<SkMask::Format>(glyph.fMaskFormat);
     switch (format) {
         case SkMask::kBW_Format:
             // fall through to kA8 -- we store BW glyphs in our 8-bit cache
         case SkMask::kA8_Format:
             return kA8_GrMaskFormat;
         case SkMask::kLCD16_Format:
             return kA565_GrMaskFormat;
@@ skipping 140 matching lines @@
 
 const SkPath* GrFontScaler::getGlyphPath(const SkGlyph& glyph) {
     return fStrike->findPath(glyph);
 }
 
 const SkGlyph& GrFontScaler::grToSkGlyph(GrGlyph::PackedID id) {
     return fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(id),
                                       GrGlyph::UnpackFixedX(id),
                                       GrGlyph::UnpackFixedY(id));
 }