Remove race.

BUG=skia:

Review URL: https://codereview.chromium.org/1327193003

diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index f4674b7..dbdf6f7 100644 (file)
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1504,12 +1504,9 @@ static void D1G_RgnClip(const SkDraw1Glyph& state, Sk48Dot16 fx, Sk48Dot16 fy, c
 
     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();