From c2ff52920b43304e83d7def592dfacc73b54373e Mon Sep 17 00:00:00 2001 From: herb Date: Fri, 6 Mar 2015 16:15:23 -0800 Subject: [PATCH] Fix bit rot in SkGlyphCache validate code. TESTED CFLAGS=-DSK_DEBUG_GLYPH_CACHE CPPFLAGS=-DSK_DEBUG_GLYPH_CACHE ./gyp_skia ninja -C out/Debug dm out/Debug/dm Review URL: https://codereview.chromium.org/989683002 --- src/core/SkGlyphCache.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp index 224a70a..ec34227 100755 --- a/src/core/SkGlyphCache.cpp +++ b/src/core/SkGlyphCache.cpp @@ -662,15 +662,11 @@ void SkGlyphCache::validate() const { #ifdef SK_DEBUG_GLYPH_CACHE int count = fGlyphArray.count(); for (int i = 0; i < count; i++) { - const SkGlyph* glyph = fGlyphArray[i]; + const SkGlyph* glyph = &fGlyphArray[i]; SkASSERT(glyph); - SkASSERT(fGlyphAlloc.contains(glyph)); if (glyph->fImage) { SkASSERT(fGlyphAlloc.contains(glyph->fImage)); } - if (glyph->fDistanceField) { - SkASSERT(fGlyphAlloc.contains(glyph->fDistanceField)); - } } #endif } -- 2.7.4