| 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 "GrFontAtlasSizes.h" | 10 #include "GrFontAtlasSizes.h" |
| 10 #include "GrGpu.h" | 11 #include "GrGpu.h" |
| 11 #include "GrRectanizer.h" | 12 #include "GrRectanizer.h" |
| 12 #include "GrSurfacePriv.h" | 13 #include "GrSurfacePriv.h" |
| 13 #include "SkString.h" | 14 #include "SkString.h" |
| 14 | 15 |
| 15 #include "SkDistanceFieldGen.h" | 16 #include "SkDistanceFieldGen.h" |
| 16 | 17 |
| 17 /////////////////////////////////////////////////////////////////////////////// | 18 /////////////////////////////////////////////////////////////////////////////// |
| 18 | 19 |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 } | 236 } |
| 236 | 237 |
| 237 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, g
lyph->fMaskFormat, | 238 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, g
lyph->fMaskFormat, |
| 238 glyph->width(), glyph->height(), | 239 glyph->width(), glyph->height(), |
| 239 storage.get(), &glyph->fAtlasLoca
tion); | 240 storage.get(), &glyph->fAtlasLoca
tion); |
| 240 if (success) { | 241 if (success) { |
| 241 fAtlasedGlyphs++; | 242 fAtlasedGlyphs++; |
| 242 } | 243 } |
| 243 return success; | 244 return success; |
| 244 } | 245 } |
| OLD | NEW |