Revert of Parallel cache - preliminary

src/core/SkDraw.cpp

 /*
  * 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.
  */
 #define __STDC_LIMIT_MACROS
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
@@ skipping 1458 matching lines @@
     mask.fBounds.set(left, top, right, bottom);
 
     // this extra test is worth it, assuming that most of the time it succeeds
     // since we can avoid writing to storage
     if (!state.fClipBounds.containsNoEmptyCheck(left, top, right, bottom)) {
         if (!storage.intersectNoEmptyCheck(mask.fBounds, state.fClipBounds))
             return;
         bounds = &storage;
     }
 
-    uint8_t*aa = (uint8_t*)state.fCache->findImage(glyph);
+    uint8_t* aa = (uint8_t*)glyph.fImage;
     if (nullptr == aa) {
-        return; // can't rasterize glyph
+        aa = (uint8_t*)state.fCache->findImage(glyph);
+        if (nullptr == aa) {
+            return; // can't rasterize glyph
+        }
     }
 
-
     mask.fRowBytes = glyph.rowBytes();
     mask.fFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
     mask.fImage = aa;
     state.blitMask(mask, *bounds);
 }
 
 static void D1G_RgnClip(const SkDraw1Glyph& state, Sk48Dot16 fx, Sk48Dot16 fy, const SkGlyph& glyph) {
     int left = Sk48Dot16FloorToInt(fx);
     int top = Sk48Dot16FloorToInt(fy);
     SkASSERT(glyph.fWidth > 0 && glyph.fHeight > 0);
@@ skipping 763 matching lines @@
         mask->fImage = SkMask::AllocImage(size);
         memset(mask->fImage, 0, mask->computeImageSize());
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
         draw_into_mask(*mask, devPath, style);
     }
 
     return true;
 }