Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: src/core/SkDraw.cpp

Issue 1339493002: Revert of Parallel cache - preliminary (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Also revert crrev.com/1333003002 Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/ports/SkAtomics_sync.h ('k') | src/core/SkGlyph.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkDraw.cpp
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index dbdf6f73dab30ae0d788533f4face440a9a21be8..d2bdd81c72cf27f0be48b68ef8da48c806d4a781 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1476,12 +1476,14 @@ static void D1G_RectClip(const SkDraw1Glyph& state, Sk48Dot16 fx, Sk48Dot16 fy,
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;
« no previous file with comments | « include/ports/SkAtomics_sync.h ('k') | src/core/SkGlyph.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698