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

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

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 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 | « 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 #ifndef GrAtlas_DEFINED 9 #ifndef GrAtlas_DEFINED
10 #define GrAtlas_DEFINED 10 #define GrAtlas_DEFINED
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 friend class GrAtlas; 85 friend class GrAtlas;
86 }; 86 };
87 87
88 GrAtlas(GrGpu*, GrPixelConfig, GrSurfaceFlags flags, 88 GrAtlas(GrGpu*, GrPixelConfig, GrSurfaceFlags flags,
89 const SkISize& backingTextureSize, 89 const SkISize& backingTextureSize,
90 int numPlotsX, int numPlotsY, bool batchUploads); 90 int numPlotsX, int numPlotsY, bool batchUploads);
91 ~GrAtlas(); 91 ~GrAtlas();
92 92
93 // Adds a width x height subimage to the atlas. Upon success it returns 93 // Adds a width x height subimage to the atlas. Upon success it returns
94 // the containing GrPlot and absolute location in the backing texture. 94 // the containing GrPlot and absolute location in the backing texture.
95 // NULL is returned if the subimage cannot fit in the atlas. 95 // nullptr is returned if the subimage cannot fit in the atlas.
96 // If provided, the image data will either be immediately uploaded or 96 // If provided, the image data will either be immediately uploaded or
97 // written to the CPU-side backing bitmap. 97 // written to the CPU-side backing bitmap.
98 GrPlot* addToAtlas(ClientPlotUsage*, int width, int height, const void* imag e, SkIPoint16* loc); 98 GrPlot* addToAtlas(ClientPlotUsage*, int width, int height, const void* imag e, SkIPoint16* loc);
99 99
100 // remove reference to this plot 100 // remove reference to this plot
101 static void RemovePlot(ClientPlotUsage* usage, const GrPlot* plot); 101 static void RemovePlot(ClientPlotUsage* usage, const GrPlot* plot);
102 102
103 GrTexture* getTexture() const { 103 GrTexture* getTexture() const {
104 return fTexture; 104 return fTexture;
105 } 105 }
(...skipping 22 matching lines...) Expand all
128 int fNumPlotsY; 128 int fNumPlotsY;
129 bool fBatchUploads; 129 bool fBatchUploads;
130 130
131 // allocated array of GrPlots 131 // allocated array of GrPlots
132 GrPlot* fPlotArray; 132 GrPlot* fPlotArray;
133 // LRU list of GrPlots (MRU at head - LRU at tail) 133 // LRU list of GrPlots (MRU at head - LRU at tail)
134 GrPlotList fPlotList; 134 GrPlotList fPlotList;
135 }; 135 };
136 136
137 #endif 137 #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