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

Side by Side Diff: src/gpu/GrBatchFontCache.cpp

Issue 1267623004: Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « src/gpu/GrBatchAtlas.cpp ('k') | tests/TextBlobCacheTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 glyph->width() * bytesPerPixel, expecte dMaskFormat, 220 glyph->width() * bytesPerPixel, expecte dMaskFormat,
221 storage.get())) { 221 storage.get())) {
222 return false; 222 return false;
223 } 223 }
224 } 224 }
225 225
226 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, e xpectedMaskFormat, 226 bool success = fBatchFontCache->addToAtlas(this, &glyph->fID, batchTarget, e xpectedMaskFormat,
227 glyph->width(), glyph->height(), 227 glyph->width(), glyph->height(),
228 storage.get(), &glyph->fAtlasLoca tion); 228 storage.get(), &glyph->fAtlasLoca tion);
229 if (success) { 229 if (success) {
230 SkASSERT(GrBatchAtlas::kInvalidAtlasID != glyph->fID);
231 fAtlasedGlyphs++; 230 fAtlasedGlyphs++;
232 } 231 }
233 return success; 232 return success;
234 } 233 }
OLDNEW
« no previous file with comments | « src/gpu/GrBatchAtlas.cpp ('k') | tests/TextBlobCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698