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

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

Issue 27343002: Second wave of Win64 warning cleanup (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: switched count_glyphs back to int Created 7 years, 2 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/core/SkPictureRecord.cpp ('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 #ifndef GrAtlas_DEFINED 9 #ifndef GrAtlas_DEFINED
10 #define GrAtlas_DEFINED 10 #define GrAtlas_DEFINED
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 // for recycling 48 // for recycling
49 GrDrawTarget::DrawToken fDrawToken; 49 GrDrawTarget::DrawToken fDrawToken;
50 50
51 GrPlot* fNext; 51 GrPlot* fNext;
52 52
53 GrTexture* fTexture; 53 GrTexture* fTexture;
54 GrRectanizer* fRects; 54 GrRectanizer* fRects;
55 GrAtlasMgr* fAtlasMgr; 55 GrAtlasMgr* fAtlasMgr;
56 GrIPoint16 fOffset; 56 GrIPoint16 fOffset;
57 int fBytesPerPixel; 57 size_t fBytesPerPixel;
58 58
59 friend class GrAtlasMgr; 59 friend class GrAtlasMgr;
60 }; 60 };
61 61
62 class GrAtlasMgr { 62 class GrAtlasMgr {
63 public: 63 public:
64 GrAtlasMgr(GrGpu*, GrPixelConfig); 64 GrAtlasMgr(GrGpu*, GrPixelConfig);
65 ~GrAtlasMgr(); 65 ~GrAtlasMgr();
66 66
67 // add subimage of width, height dimensions to atlas 67 // add subimage of width, height dimensions to atlas
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 bool isEmpty() { return NULL == fPlots; } 100 bool isEmpty() { return NULL == fPlots; }
101 101
102 private: 102 private:
103 GrPlot* fPlots; 103 GrPlot* fPlots;
104 GrAtlasMgr* fAtlasMgr; 104 GrAtlasMgr* fAtlasMgr;
105 105
106 friend class GrAtlasMgr; 106 friend class GrAtlasMgr;
107 }; 107 };
108 108
109 #endif 109 #endif
OLDNEW
« no previous file with comments | « src/core/SkPictureRecord.cpp ('k') | src/gpu/GrAtlas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698