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

Side by Side Diff: src/core/SkPictureFlat.cpp

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/core/SkPictureFlat.h ('k') | src/core/SkPicturePlayback.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 2011 Google Inc. 3 * Copyright 2011 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 #include "SkPictureFlat.h" 8 #include "SkPictureFlat.h"
9 9
10 #include "SkChecksum.h" 10 #include "SkChecksum.h"
11 #include "SkColorFilter.h" 11 #include "SkColorFilter.h"
12 #include "SkDrawLooper.h" 12 #include "SkDrawLooper.h"
13 #include "SkMaskFilter.h" 13 #include "SkMaskFilter.h"
14 #include "SkRasterizer.h" 14 #include "SkRasterizer.h"
15 #include "SkShader.h" 15 #include "SkShader.h"
16 #include "SkTypeface.h" 16 #include "SkTypeface.h"
17 #include "SkXfermode.h" 17 #include "SkXfermode.h"
18 18
19 /////////////////////////////////////////////////////////////////////////////// 19 ///////////////////////////////////////////////////////////////////////////////
20 20
21 SkTypefacePlayback::SkTypefacePlayback() : fCount(0), fArray(NULL) {} 21 SkTypefacePlayback::SkTypefacePlayback() : fCount(0), fArray(nullptr) {}
22 22
23 SkTypefacePlayback::~SkTypefacePlayback() { 23 SkTypefacePlayback::~SkTypefacePlayback() {
24 this->reset(NULL); 24 this->reset(nullptr);
25 } 25 }
26 26
27 void SkTypefacePlayback::reset(const SkRefCntSet* rec) { 27 void SkTypefacePlayback::reset(const SkRefCntSet* rec) {
28 for (int i = 0; i < fCount; i++) { 28 for (int i = 0; i < fCount; i++) {
29 SkASSERT(fArray[i]); 29 SkASSERT(fArray[i]);
30 fArray[i]->unref(); 30 fArray[i]->unref();
31 } 31 }
32 delete[] fArray; 32 delete[] fArray;
33 33
34 if (rec!= NULL && rec->count() > 0) { 34 if (rec!= nullptr && rec->count() > 0) {
35 fCount = rec->count(); 35 fCount = rec->count();
36 fArray = new SkRefCnt* [fCount]; 36 fArray = new SkRefCnt* [fCount];
37 rec->copyToArray(fArray); 37 rec->copyToArray(fArray);
38 for (int i = 0; i < fCount; i++) { 38 for (int i = 0; i < fCount; i++) {
39 fArray[i]->ref(); 39 fArray[i]->ref();
40 } 40 }
41 } else { 41 } else {
42 fCount = 0; 42 fCount = 0;
43 fArray = NULL; 43 fArray = nullptr;
44 } 44 }
45 } 45 }
46 46
47 void SkTypefacePlayback::setCount(int count) { 47 void SkTypefacePlayback::setCount(int count) {
48 this->reset(NULL); 48 this->reset(nullptr);
49 49
50 fCount = count; 50 fCount = count;
51 fArray = new SkRefCnt* [count]; 51 fArray = new SkRefCnt* [count];
52 sk_bzero(fArray, count * sizeof(SkRefCnt*)); 52 sk_bzero(fArray, count * sizeof(SkRefCnt*));
53 } 53 }
54 54
55 SkRefCnt* SkTypefacePlayback::set(int index, SkRefCnt* obj) { 55 SkRefCnt* SkTypefacePlayback::set(int index, SkRefCnt* obj) {
56 SkASSERT((unsigned)index < (unsigned)fCount); 56 SkASSERT((unsigned)index < (unsigned)fCount);
57 SkRefCnt_SafeAssign(fArray[index], obj); 57 SkRefCnt_SafeAssign(fArray[index], obj);
58 return obj; 58 return obj;
59 } 59 }
60 60
61 /////////////////////////////////////////////////////////////////////////////// 61 ///////////////////////////////////////////////////////////////////////////////
62 62
63 SkFlatController::SkFlatController(uint32_t writeBufferFlags) 63 SkFlatController::SkFlatController(uint32_t writeBufferFlags)
64 : fBitmapHeap(NULL) 64 : fBitmapHeap(nullptr)
65 , fTypefaceSet(NULL) 65 , fTypefaceSet(nullptr)
66 , fTypefacePlayback(NULL) 66 , fTypefacePlayback(nullptr)
67 , fFactorySet(NULL) 67 , fFactorySet(nullptr)
68 , fWriteBufferFlags(writeBufferFlags) {} 68 , fWriteBufferFlags(writeBufferFlags) {}
69 69
70 SkFlatController::~SkFlatController() { 70 SkFlatController::~SkFlatController() {
71 SkSafeUnref(fBitmapHeap); 71 SkSafeUnref(fBitmapHeap);
72 SkSafeUnref(fTypefaceSet); 72 SkSafeUnref(fTypefaceSet);
73 SkSafeUnref(fFactorySet); 73 SkSafeUnref(fFactorySet);
74 } 74 }
75 75
76 void SkFlatController::setBitmapHeap(SkBitmapHeap* heap) { 76 void SkFlatController::setBitmapHeap(SkBitmapHeap* heap) {
77 SkRefCnt_SafeAssign(fBitmapHeap, heap); 77 SkRefCnt_SafeAssign(fBitmapHeap, heap);
78 } 78 }
79 79
80 void SkFlatController::setTypefaceSet(SkRefCntSet *set) { 80 void SkFlatController::setTypefaceSet(SkRefCntSet *set) {
81 SkRefCnt_SafeAssign(fTypefaceSet, set); 81 SkRefCnt_SafeAssign(fTypefaceSet, set);
82 } 82 }
83 83
84 void SkFlatController::setTypefacePlayback(SkTypefacePlayback* playback) { 84 void SkFlatController::setTypefacePlayback(SkTypefacePlayback* playback) {
85 fTypefacePlayback = playback; 85 fTypefacePlayback = playback;
86 } 86 }
87 87
88 SkNamedFactorySet* SkFlatController::setNamedFactorySet(SkNamedFactorySet* set) { 88 SkNamedFactorySet* SkFlatController::setNamedFactorySet(SkNamedFactorySet* set) {
89 SkRefCnt_SafeAssign(fFactorySet, set); 89 SkRefCnt_SafeAssign(fFactorySet, set);
90 return set; 90 return set;
91 } 91 }
OLDNEW
« no previous file with comments | « src/core/SkPictureFlat.h ('k') | src/core/SkPicturePlayback.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698