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

Unified Diff: samplecode/SampleHairline.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 | « samplecode/SampleHairModes.cpp ('k') | samplecode/SampleIdentityScale.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleHairline.cpp
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index bb2e2f171c8d2185765e94b48740380e61d94345..a8985c851e8d33d27008bcc074b81fa338bc7df2 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -197,8 +197,8 @@ protected:
void show_bitmaps(SkCanvas* canvas, const SkBitmap& b0, const SkBitmap& b1,
const SkIRect& inset) {
- canvas->drawBitmap(b0, 0, 0, NULL);
- canvas->drawBitmap(b1, SkIntToScalar(b0.width()), 0, NULL);
+ canvas->drawBitmap(b0, 0, 0, nullptr);
+ canvas->drawBitmap(b1, SkIntToScalar(b0.width()), 0, nullptr);
}
void onDrawContent(SkCanvas* canvas) override {
@@ -219,7 +219,7 @@ protected:
bm2.eraseColor(SK_ColorTRANSPARENT);
gProcs[fProcIndex].fProc(&c2, paint, bm);
- canvas->drawBitmap(bm2, SkIntToScalar(10), SkIntToScalar(10), NULL);
+ canvas->drawBitmap(bm2, SkIntToScalar(10), SkIntToScalar(10), nullptr);
}
bool onAnimate(const SkAnimTimer&) override {
@@ -233,7 +233,7 @@ protected:
SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
fDoAA = !fDoAA;
- this->inval(NULL);
+ this->inval(nullptr);
return this->INHERITED::onFindClickHandler(x, y, modi);
}
« no previous file with comments | « samplecode/SampleHairModes.cpp ('k') | samplecode/SampleIdentityScale.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698