| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "GrBatchFontCache.h" | 8 #include "GrBatchFontCache.h" |
| 9 #include "GrContext.h" | 9 #include "GrContext.h" |
| 10 #include "GrFontAtlasSizes.h" | 10 #include "GrFontAtlasSizes.h" |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 glyph->width() * bytesPerPixel, expecte
dMaskFormat, | 219 glyph->width() * bytesPerPixel, expecte
dMaskFormat, |
| 220 storage.get())) { | 220 storage.get())) { |
| 221 return false; | 221 return false; |
| 222 } | 222 } |
| 223 } | 223 } |
| 224 | 224 |
| 225 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, e
xpectedMaskFormat, | 225 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, e
xpectedMaskFormat, |
| 226 glyph->width(), glyph->height(), | 226 glyph->width(), glyph->height(), |
| 227 storage.get(), &glyph->fAtlasLoca
tion); | 227 storage.get(), &glyph->fAtlasLoca
tion); |
| 228 if (success) { | 228 if (success) { |
| 229 SkASSERT(GrBatchAtlas::kInvalidAtlasID != glyph->fID); |
| 229 fAtlasedGlyphs++; | 230 fAtlasedGlyphs++; |
| 230 } | 231 } |
| 231 return success; | 232 return success; |
| 232 } | 233 } |
| OLD | NEW |