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

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

Issue 510103003: Revert of Restore text alloc optimizations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 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 | « gm/fontcache.cpp ('k') | 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 12 matching lines...) Expand all
23 virtual void drawText(const GrPaint&, const SkPaint&, const char text[], siz e_t byteLength, 23 virtual void drawText(const GrPaint&, const SkPaint&, const char text[], siz e_t byteLength,
24 SkScalar x, SkScalar y) SK_OVERRIDE; 24 SkScalar x, SkScalar y) SK_OVERRIDE;
25 virtual void drawPosText(const GrPaint&, const SkPaint&, 25 virtual void drawPosText(const GrPaint&, const SkPaint&,
26 const char text[], size_t byteLength, 26 const char text[], size_t byteLength,
27 const SkScalar pos[], SkScalar constY, 27 const SkScalar pos[], SkScalar constY,
28 int scalarsPerPosition) SK_OVERRIDE; 28 int scalarsPerPosition) SK_OVERRIDE;
29 29
30 virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE; 30 virtual bool canDraw(const SkPaint& paint) SK_OVERRIDE;
31 31
32 private: 32 private:
33 GrTextStrike* fStrike;
34
33 void init(const GrPaint&, const SkPaint&); 35 void init(const GrPaint&, const SkPaint&);
34 void allocateVertices(const char text[], size_t byteLength);
35 void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontSca ler*); 36 void drawPackedGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontSca ler*);
36 void flushGlyphs(); // automatically called by destructor 37 void flushGlyphs(); // automatically called by destructor
37 void finish(); 38 void finish();
38 39
39 enum { 40 enum {
40 kMinRequestedGlyphs = 1, 41 kMinRequestedGlyphs = 1,
41 kDefaultRequestedGlyphs = 64, 42 kDefaultRequestedGlyphs = 64,
42 kMinRequestedVerts = kMinRequestedGlyphs * 4, 43 kMinRequestedVerts = kMinRequestedGlyphs * 4,
43 kDefaultRequestedVerts = kDefaultRequestedGlyphs * 4, 44 kDefaultRequestedVerts = kDefaultRequestedGlyphs * 4,
44 }; 45 };
45 46
46 GrTextStrike* fStrike; 47 void* fVertices;
48 int32_t fMaxVertices;
49 GrTexture* fCurrTexture;
47 SkAutoTUnref<GrEffect> fCachedEffect; 50 SkAutoTUnref<GrEffect> fCachedEffect;
48 // Used to check whether fCachedEffect is still valid. 51 // Used to check whether fCachedEffect is still valid.
49 uint32_t fEffectTextureUniqueID; 52 uint32_t fEffectTextureUniqueID;
50
51 void* fVertices;
52 int fVertexCount;
53 int fCurrVertex; 53 int fCurrVertex;
54 SkRect fVertexBounds; 54 SkRect fVertexBounds;
55 }; 55 };
56 56
57 #endif 57 #endif
OLDNEW
« no previous file with comments | « gm/fontcache.cpp ('k') | src/gpu/GrBitmapTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698