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

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

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « src/gpu/GrAllocator.h ('k') | src/gpu/GrAtlas.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 /* 2 /*
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 class GrAtlasMgr { 65 class GrAtlasMgr {
66 public: 66 public:
67 GrAtlasMgr(GrGpu*); 67 GrAtlasMgr(GrGpu*);
68 ~GrAtlasMgr(); 68 ~GrAtlasMgr();
69 69
70 GrAtlas* addToAtlas(GrAtlas**, int width, int height, const void*, 70 GrAtlas* addToAtlas(GrAtlas**, int width, int height, const void*,
71 GrMaskFormat, GrIPoint16*); 71 GrMaskFormat, GrIPoint16*);
72 void deleteAtlas(GrAtlas* atlas) { delete atlas; } 72 void deleteAtlas(GrAtlas* atlas) { delete atlas; }
73 73
74 GrTexture* getTexture(GrMaskFormat format) const { 74 GrTexture* getTexture(GrMaskFormat format) const {
75 GrAssert((unsigned)format < kCount_GrMaskFormats); 75 SkASSERT((unsigned)format < kCount_GrMaskFormats);
76 return fTexture[format]; 76 return fTexture[format];
77 } 77 }
78 78
79 // to be called by ~GrAtlas() 79 // to be called by ~GrAtlas()
80 void freePlot(GrMaskFormat format, int x, int y); 80 void freePlot(GrMaskFormat format, int x, int y);
81 81
82 private: 82 private:
83 GrGpu* fGpu; 83 GrGpu* fGpu;
84 GrTexture* fTexture[kCount_GrMaskFormats]; 84 GrTexture* fTexture[kCount_GrMaskFormats];
85 GrPlotMgr* fPlotMgr; 85 GrPlotMgr* fPlotMgr;
86 }; 86 };
87 87
88 #endif 88 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrAllocator.h ('k') | src/gpu/GrAtlas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698