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

Unified Diff: src/gpu/GrLayerCache.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, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrInOrderCommandBuilder.cpp ('k') | src/gpu/GrLayerCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrLayerCache.h
diff --git a/src/gpu/GrLayerCache.h b/src/gpu/GrLayerCache.h
index 4ab0fa4eff658673dfbe6a26a1e274cf366510ea..0fb23f2298442dd00d967acabf7a9eacb08bcb53 100644
--- a/src/gpu/GrLayerCache.h
+++ b/src/gpu/GrLayerCache.h
@@ -158,11 +158,11 @@ public:
, fSrcIR(srcIR)
, fDstIR(dstIR)
, fOffset(SkIPoint::Make(0, 0))
- , fPaint(paint ? new SkPaint(*paint) : NULL)
- , fFilter(NULL)
- , fTexture(NULL)
+ , fPaint(paint ? new SkPaint(*paint) : nullptr)
+ , fFilter(nullptr)
+ , fTexture(nullptr)
, fRect(SkIRect::MakeEmpty())
- , fPlot(NULL)
+ , fPlot(nullptr)
, fUses(0)
, fLocked(false) {
SkASSERT(SK_InvalidGenID != pictureID);
@@ -170,7 +170,7 @@ public:
if (fPaint) {
if (fPaint->getImageFilter()) {
fFilter = SkSafeRef(fPaint->getImageFilter());
- fPaint->setImageFilter(NULL);
+ fPaint->setImageFilter(nullptr);
}
}
}
@@ -207,7 +207,7 @@ public:
const SkIPoint& offset() const { return fOffset; }
void setPlot(GrPlot* plot) {
- SkASSERT(NULL == plot || NULL == fPlot);
+ SkASSERT(nullptr == plot || nullptr == fPlot);
fPlot = plot;
}
GrPlot* plot() { return fPlot; }
@@ -237,7 +237,7 @@ private:
SkIPoint fOffset;
// The paint used when dropping the layer down into the owning canvas.
- // Can be NULL. This class makes a copy for itself.
+ // Can be nullptr. This class makes a copy for itself.
SkPaint* fPaint;
// The imagefilter that needs to be applied to the layer prior to it being
@@ -250,11 +250,11 @@ private:
// For both atlased and non-atlased layers 'fRect' contains the bound of
// the layer in whichever texture it resides. It is empty when 'fTexture'
- // is NULL.
+ // is nullptr.
SkIRect fRect;
// For atlased layers, fPlot stores the atlas plot in which the layer rests.
- // It is always NULL for non-atlased layers.
+ // It is always nullptr for non-atlased layers.
GrPlot* fPlot;
// The number of actively hoisted layers using this cached image (e.g.,
« no previous file with comments | « src/gpu/GrInOrderCommandBuilder.cpp ('k') | src/gpu/GrLayerCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698