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

Unified Diff: samplecode/SampleRegion.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/SampleRectanizer.cpp ('k') | samplecode/SampleRepeatTile.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleRegion.cpp
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 80478443071911218151ebd1bdcb80539fbdac39..eb3e134af9ef7db48514aa80523dcdeb502fdca4 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -43,12 +43,12 @@ static void test_strokerect(SkCanvas* canvas) {
// use the rect
c.clear(SK_ColorTRANSPARENT);
c.drawRect(r, paint);
- canvas->drawBitmap(bitmap, 0, 0, NULL);
+ canvas->drawBitmap(bitmap, 0, 0, nullptr);
// use the path
c.clear(SK_ColorTRANSPARENT);
c.drawPath(path, paint);
- canvas->drawBitmap(bitmap, SkIntToScalar(2*width), 0, NULL);
+ canvas->drawBitmap(bitmap, SkIntToScalar(2*width), 0, nullptr);
}
static void drawFadingText(SkCanvas* canvas,
@@ -65,7 +65,7 @@ static void drawFadingText(SkCanvas* canvas,
// antialiasing
bounds.inset(-SkIntToScalar(2), -SkIntToScalar(2));
- canvas->saveLayer(&bounds, NULL);
+ canvas->saveLayer(&bounds, nullptr);
canvas->drawText(text, len, x, y, paint);
const SkPoint pts[] = {
@@ -112,7 +112,7 @@ static void test_text(SkCanvas* canvas) {
canvas->drawText(str, len, x, y, paint);
y += 20;
- paint.setShader(NULL);
+ paint.setShader(nullptr);
drawFadingText(canvas, str, len, x, y, paint);
}
@@ -269,7 +269,7 @@ protected:
{
char buffer[1000];
- SkDEBUGCODE(size_t size = ) tmp.writeToMemory(NULL);
+ SkDEBUGCODE(size_t size = ) tmp.writeToMemory(nullptr);
SkASSERT(size <= sizeof(buffer));
SkDEBUGCODE(size_t size2 = ) tmp.writeToMemory(buffer);
SkASSERT(size == size2);
@@ -392,13 +392,13 @@ protected:
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
unsigned modi) override {
return fRect.contains(SkScalarRoundToInt(x),
- SkScalarRoundToInt(y)) ? new Click(this) : NULL;
+ SkScalarRoundToInt(y)) ? new Click(this) : nullptr;
}
bool onClick(Click* click) override {
fRect.offset(click->fICurr.fX - click->fIPrev.fX,
click->fICurr.fY - click->fIPrev.fY);
- this->inval(NULL);
+ this->inval(nullptr);
return true;
}
« no previous file with comments | « samplecode/SampleRectanizer.cpp ('k') | samplecode/SampleRepeatTile.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698