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

Side by Side Diff: src/utils/SkPatchUtils.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/utils/SkPatchGrid.cpp ('k') | src/utils/SkPatchUtils.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 2014 Google Inc. 2 * Copyright 2014 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 SkPatchUtils_DEFINED 8 #ifndef SkPatchUtils_DEFINED
9 #define SkPatchUtils_DEFINED 9 #define SkPatchUtils_DEFINED
10 10
(...skipping 11 matching lines...) Expand all
22 struct VertexData { 22 struct VertexData {
23 int fVertexCount, fIndexCount; 23 int fVertexCount, fIndexCount;
24 SkPoint* fPoints; 24 SkPoint* fPoints;
25 SkPoint* fTexCoords; 25 SkPoint* fTexCoords;
26 uint32_t* fColors; 26 uint32_t* fColors;
27 uint16_t* fIndices; 27 uint16_t* fIndices;
28 28
29 VertexData() 29 VertexData()
30 : fVertexCount(0) 30 : fVertexCount(0)
31 , fIndexCount(0) 31 , fIndexCount(0)
32 , fPoints(NULL) 32 , fPoints(nullptr)
33 , fTexCoords(NULL) 33 , fTexCoords(nullptr)
34 , fColors(NULL) 34 , fColors(nullptr)
35 , fIndices(NULL) { } 35 , fIndices(nullptr) { }
36 36
37 ~VertexData() { 37 ~VertexData() {
38 delete[] fPoints; 38 delete[] fPoints;
39 delete[] fTexCoords; 39 delete[] fTexCoords;
40 delete[] fColors; 40 delete[] fColors;
41 delete[] fIndices; 41 delete[] fIndices;
42 } 42 }
43 }; 43 };
44 44
45 // Enums for control points based on the order specified in the constructor (clockwise). 45 // Enums for control points based on the order specified in the constructor (clockwise).
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 * colors refers to the corner colors that will be bilerp across the patch ( optional parameter) 112 * colors refers to the corner colors that will be bilerp across the patch ( optional parameter)
113 * texCoords refers to the corner texture coordinates that will be bilerp ac ross the patch 113 * texCoords refers to the corner texture coordinates that will be bilerp ac ross the patch
114 (optional parameter) 114 (optional parameter)
115 */ 115 */
116 static bool getVertexData(SkPatchUtils::VertexData* data, const SkPoint cubi cs[12], 116 static bool getVertexData(SkPatchUtils::VertexData* data, const SkPoint cubi cs[12],
117 const SkColor colors[4], const SkPoint texCoords[4 ], 117 const SkColor colors[4], const SkPoint texCoords[4 ],
118 int lodX, int lodY); 118 int lodX, int lodY);
119 }; 119 };
120 120
121 #endif 121 #endif
OLDNEW
« no previous file with comments | « src/utils/SkPatchGrid.cpp ('k') | src/utils/SkPatchUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698