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

Side by Side Diff: src/gpu/GrAtlasTextBlob.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/GrAtlas.cpp ('k') | src/gpu/GrAtlasTextContext.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 2015 Google Inc. 2 * Copyright 2015 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 GrAtlasTextBlob_DEFINED 8 #ifndef GrAtlasTextBlob_DEFINED
9 #define GrAtlasTextBlob_DEFINED 9 #define GrAtlasTextBlob_DEFINED
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 , fVertexEndIndex(that.fVertexEndIndex) 86 , fVertexEndIndex(that.fVertexEndIndex)
87 , fGlyphStartIndex(that.fGlyphStartIndex) 87 , fGlyphStartIndex(that.fGlyphStartIndex)
88 , fGlyphEndIndex(that.fGlyphEndIndex) 88 , fGlyphEndIndex(that.fGlyphEndIndex)
89 , fTextRatio(that.fTextRatio) 89 , fTextRatio(that.fTextRatio)
90 , fMaskFormat(that.fMaskFormat) 90 , fMaskFormat(that.fMaskFormat)
91 , fDrawAsDistanceFields(that.fDrawAsDistanceFields) 91 , fDrawAsDistanceFields(that.fDrawAsDistanceFields)
92 , fUseLCDText(that.fUseLCDText) { 92 , fUseLCDText(that.fUseLCDText) {
93 } 93 }
94 // Distance field text cannot draw coloremoji, and so has to fall ba ck. However, 94 // Distance field text cannot draw coloremoji, and so has to fall ba ck. However,
95 // though the distance field text and the coloremoji may share the s ame run, they 95 // though the distance field text and the coloremoji may share the s ame run, they
96 // will have different descriptors. If fOverrideDescriptor is non-N ULL, then it 96 // will have different descriptors. If fOverrideDescriptor is non-n ullptr, then it
97 // will be used in place of the run's descriptor to regen texture co ords 97 // will be used in place of the run's descriptor to regen texture co ords
98 // TODO we could have a descriptor cache, it would reduce the size o f these blobs 98 // TODO we could have a descriptor cache, it would reduce the size o f these blobs
99 // significantly, and then the subrun could just have a refed pointe r to the 99 // significantly, and then the subrun could just have a refed pointe r to the
100 // correct descriptor. 100 // correct descriptor.
101 GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken; 101 GrBatchAtlas::BulkUseTokenUpdater fBulkUseToken;
102 SkAutoTUnref<GrBatchTextStrike> fStrike; 102 SkAutoTUnref<GrBatchTextStrike> fStrike;
103 uint64_t fAtlasGeneration; 103 uint64_t fAtlasGeneration;
104 size_t fVertexStartIndex; 104 size_t fVertexStartIndex;
105 size_t fVertexEndIndex; 105 size_t fVertexEndIndex;
106 uint32_t fGlyphStartIndex; 106 uint32_t fGlyphStartIndex;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 void setHasDistanceField() { fTextType |= kHasDistanceField_TextType; } 238 void setHasDistanceField() { fTextType |= kHasDistanceField_TextType; }
239 void setHasBitmap() { fTextType |= kHasBitmap_TextType; } 239 void setHasBitmap() { fTextType |= kHasBitmap_TextType; }
240 240
241 #ifdef CACHE_SANITY_CHECK 241 #ifdef CACHE_SANITY_CHECK
242 static void AssertEqual(const GrAtlasTextBlob&, const GrAtlasTextBlob&); 242 static void AssertEqual(const GrAtlasTextBlob&, const GrAtlasTextBlob&);
243 size_t fSize; 243 size_t fSize;
244 #endif 244 #endif
245 }; 245 };
246 246
247 #endif 247 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrAtlas.cpp ('k') | src/gpu/GrAtlasTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698