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

Unified Diff: src/gpu/GrBatchAtlas.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, 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/GrBatchAtlas.h ('k') | src/gpu/GrBatchFontCache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrBatchAtlas.cpp
diff --git a/src/gpu/GrBatchAtlas.cpp b/src/gpu/GrBatchAtlas.cpp
index 1607ed12f623bc5eed1e75490e65f6db46881386..ebd0907841ce3bb1f17694b5315f30aace5ad420 100644
--- a/src/gpu/GrBatchAtlas.cpp
+++ b/src/gpu/GrBatchAtlas.cpp
@@ -131,14 +131,14 @@ private:
, fIndex(-1)
, fGenID(-1)
, fID(0)
- , fData(NULL)
+ , fData(nullptr)
, fWidth(0)
, fHeight(0)
, fX(0)
, fY(0)
- , fTexture(NULL)
- , fRects(NULL)
- , fAtlas(NULL)
+ , fTexture(nullptr)
+ , fRects(nullptr)
+ , fAtlas(nullptr)
, fBytesPerPixel(1)
#ifdef SK_DEBUG
, fDirty(false)
@@ -149,7 +149,7 @@ private:
~BatchPlot() {
sk_free(fData);
- fData = NULL;
+ fData = nullptr;
delete fRects;
}
@@ -166,7 +166,7 @@ private:
fAtlas = atlas;
fOffset.set(offX * width, offY * height);
fBytesPerPixel = bpp;
- fData = NULL;
+ fData = nullptr;
fDirtyRect.setEmpty();
SkDEBUGCODE(fDirty = false;)
fTexture = texture;
« no previous file with comments | « src/gpu/GrBatchAtlas.h ('k') | src/gpu/GrBatchFontCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698