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

Side by Side Diff: src/gpu/GrBitmapTextContext.h

Issue 438683006: Rollback text allocation changes. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix line overruns Created 6 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 | « no previous file | src/gpu/GrBitmapTextContext.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 2013 Google Inc. 2 * Copyright 2013 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 #ifndef GrBitmapTextContext_DEFINED 8 #ifndef GrBitmapTextContext_DEFINED
9 #define GrBitmapTextContext_DEFINED 9 #define GrBitmapTextContext_DEFINED
10 10
(...skipping 27 matching lines...) Expand all
38 void finish(); 38 void finish();
39 39
40 enum { 40 enum {
41 kMinRequestedGlyphs = 1, 41 kMinRequestedGlyphs = 1,
42 kDefaultRequestedGlyphs = 64, 42 kDefaultRequestedGlyphs = 64,
43 kMinRequestedVerts = kMinRequestedGlyphs * 4, 43 kMinRequestedVerts = kMinRequestedGlyphs * 4,
44 kDefaultRequestedVerts = kDefaultRequestedGlyphs * 4, 44 kDefaultRequestedVerts = kDefaultRequestedGlyphs * 4,
45 }; 45 };
46 46
47 void* fVertices; 47 void* fVertices;
48 int32_t fMaxVertices;
49 GrTexture* fCurrTexture;
48 SkAutoTUnref<GrEffect> fCachedEffect; 50 SkAutoTUnref<GrEffect> fCachedEffect;
49 // Used to check whether fCachedEffect is still valid. 51 // Used to check whether fCachedEffect is still valid.
50 uint32_t fEffectTextureUniqueID; 52 uint32_t fEffectTextureUniqueID;
51 int fCurrVertex; 53 int fCurrVertex;
52 SkRect fVertexBounds; 54 SkRect fVertexBounds;
53 }; 55 };
54 56
55 #endif 57 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/GrBitmapTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698