Revert of Parallel cache - preliminary

src/core/SkGlyph.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGlyph_DEFINED
 #define SkGlyph_DEFINED
 
@@ skipping 29 matching lines @@
     void*       fImage;
     SkPath*     fPath;
     SkFixed     fAdvanceX, fAdvanceY;
 
     uint16_t    fWidth, fHeight;
     int16_t     fTop, fLeft;
 
     uint8_t     fMaskFormat;
     int8_t      fRsbDelta, fLsbDelta;  // used by auto-kerning
     int8_t      fForceBW;
-    mutable bool fImageIsSet;
-    mutable bool fPathIsSet;
 
     void initWithGlyphID(uint32_t glyph_id) {
         this->initCommon(MakeID(glyph_id));
     }
 
     void initGlyphIdFrom(const SkGlyph& glyph) {
         this->initCommon(glyph.fID);
     }
 
     void initGlyphFromCombinedID(uint32_t combined_id) {
@@ skipping 68 matching lines @@
  private:
     // TODO(herb) remove friend statement after SkGlyphCache cleanup.
     friend class SkGlyphCache;
 
     void initCommon(uint32_t id) {
         fID             = id;
         fImage          = nullptr;
         fPath           = nullptr;
         fMaskFormat     = MASK_FORMAT_UNKNOWN;
         fForceBW        = 0;
-        fImageIsSet     = false;
-        fPathIsSet      = false;
     }
 
     static unsigned ID2Code(uint32_t id) {
         return id & kCodeMask;
     }
 
     static unsigned ID2SubX(uint32_t id) {
         return id >> (kSubShift + kSubShiftX);
     }
 
@@ skipping 29 matching lines @@
 
   // FIXME - This is needed because the Android frame work directly
   // accesses fID. Remove when fID accesses are cleaned up.
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
   public:
 #endif
     uint32_t    fID;
 };
 
 #endif