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

Side by Side Diff: src/image/SkSurface_Base.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/image/SkSurface.cpp ('k') | src/image/SkSurface_Gpu.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 2012 Google Inc. 2 * Copyright 2012 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 SkSurface_Base_DEFINED 8 #ifndef SkSurface_Base_DEFINED
9 #define SkSurface_Base_DEFINED 9 #define SkSurface_Base_DEFINED
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 /** 71 /**
72 * Signal the surface to remind its backing store that it's mutable again. 72 * Signal the surface to remind its backing store that it's mutable again.
73 * Called only when we _didn't_ copy-on-write; we assume the copies start m utable. 73 * Called only when we _didn't_ copy-on-write; we assume the copies start m utable.
74 */ 74 */
75 virtual void onRestoreBackingMutability() {} 75 virtual void onRestoreBackingMutability() {}
76 76
77 inline SkCanvas* getCachedCanvas(); 77 inline SkCanvas* getCachedCanvas();
78 inline SkImage* getCachedImage(Budgeted); 78 inline SkImage* getCachedImage(Budgeted);
79 79
80 bool hasCachedImage() const { return fCachedImage != NULL; } 80 bool hasCachedImage() const { return fCachedImage != nullptr; }
81 81
82 // called by SkSurface to compute a new genID 82 // called by SkSurface to compute a new genID
83 uint32_t newGenerationID(); 83 uint32_t newGenerationID();
84 84
85 private: 85 private:
86 SkCanvas* fCachedCanvas; 86 SkCanvas* fCachedCanvas;
87 SkImage* fCachedImage; 87 SkImage* fCachedImage;
88 88
89 void aboutToDraw(ContentChangeMode mode); 89 void aboutToDraw(ContentChangeMode mode);
90 90
91 // Returns true if there is an outstanding image-snapshot, indicating that a call to aboutToDraw 91 // Returns true if there is an outstanding image-snapshot, indicating that a call to aboutToDraw
92 // would trigger a copy-on-write. 92 // would trigger a copy-on-write.
93 bool outstandingImageSnapshot() const; 93 bool outstandingImageSnapshot() const;
94 94
95 friend class SkCanvas; 95 friend class SkCanvas;
96 friend class SkSurface; 96 friend class SkSurface;
97 97
98 typedef SkSurface INHERITED; 98 typedef SkSurface INHERITED;
99 }; 99 };
100 100
101 SkCanvas* SkSurface_Base::getCachedCanvas() { 101 SkCanvas* SkSurface_Base::getCachedCanvas() {
102 if (NULL == fCachedCanvas) { 102 if (nullptr == fCachedCanvas) {
103 fCachedCanvas = this->onNewCanvas(); 103 fCachedCanvas = this->onNewCanvas();
104 if (fCachedCanvas) { 104 if (fCachedCanvas) {
105 fCachedCanvas->setSurfaceBase(this); 105 fCachedCanvas->setSurfaceBase(this);
106 } 106 }
107 } 107 }
108 return fCachedCanvas; 108 return fCachedCanvas;
109 } 109 }
110 110
111 SkImage* SkSurface_Base::getCachedImage(Budgeted budgeted) { 111 SkImage* SkSurface_Base::getCachedImage(Budgeted budgeted) {
112 if (NULL == fCachedImage) { 112 if (nullptr == fCachedImage) {
113 fCachedImage = this->onNewImageSnapshot(budgeted); 113 fCachedImage = this->onNewImageSnapshot(budgeted);
114 SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this); 114 SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this);
115 } 115 }
116 return fCachedImage; 116 return fCachedImage;
117 } 117 }
118 118
119 #endif 119 #endif
OLDNEW
« no previous file with comments | « src/image/SkSurface.cpp ('k') | src/image/SkSurface_Gpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698