Remove race.

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 1486 matching lines @@
     SkMask  mask;
 
     left += glyph.fLeft;
     top  += glyph.fTop;
 
     mask.fBounds.set(left, top, left + glyph.fWidth, top + glyph.fHeight);
     SkRegion::Cliperator clipper(*state.fClip, mask.fBounds);
 
     if (!clipper.done()) {
         const SkIRect&  cr = clipper.rect();
-        const uint8_t*  aa = (const uint8_t*)glyph.fImage;
+        const uint8_t* aa = (uint8_t*)state.fCache->findImage(glyph);
         if (nullptr == aa) {
-            aa = (uint8_t*)state.fCache->findImage(glyph);
-            if (nullptr == aa) {
-                return;
-            }
+            return;
         }
 
         mask.fRowBytes = glyph.rowBytes();
         mask.fFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
         mask.fImage = (uint8_t*)aa;
         do {
             state.blitMask(mask, cr);
             clipper.next();
         } while (!clipper.done());
     }
@@ skipping 735 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;
 }