aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleFontCache.cpp
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2015-08-27 07:41:13 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-27 07:41:16 -0700
commit96fcdcc219d2a0d3579719b84b28bede76efba64 (patch)
tree0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /samplecode/SampleFontCache.cpp
parent435af2f736c85c3274a0c6760a3523810750d237 (diff)
Style Change: NULL->nullptr
Diffstat (limited to 'samplecode/SampleFontCache.cpp')
-rw-r--r--samplecode/SampleFontCache.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SampleFontCache.cpp b/samplecode/SampleFontCache.cpp
index 77f66b0eff..5391d2449b 100644
--- a/samplecode/SampleFontCache.cpp
+++ b/samplecode/SampleFontCache.cpp
@@ -63,7 +63,7 @@ static void* measure_proc(void* context) {
while (!gDone) {
call_measure();
}
- return NULL;
+ return nullptr;
}
static void* draw_proc(void* context) {
@@ -73,7 +73,7 @@ static void* draw_proc(void* context) {
while (!gDone) {
call_draw(&canvas);
}
- return NULL;
+ return nullptr;
}
class FontCacheView : public SampleView {
@@ -89,13 +89,13 @@ public:
for (int i = 0; i < N; i++) {
int status;
- status = pthread_create(&fMThreads[i], NULL, measure_proc, NULL);
+ status = pthread_create(&fMThreads[i], nullptr, measure_proc, nullptr);
SkASSERT(0 == status);
fBitmaps[i].allocPixels(SkImageInfo::Make(320, 240,
kRGB_565_SkColorType,
kOpaque_SkAlphaType));
- status = pthread_create(&fDThreads[i], NULL, draw_proc, &fBitmaps[i]);
+ status = pthread_create(&fDThreads[i], nullptr, draw_proc, &fBitmaps[i]);
SkASSERT(0 == status);
}
this->setBGColor(0xFFDDDDDD);
@@ -129,7 +129,7 @@ protected:
canvas->drawBitmap(fBitmaps[i], x, y);
x += SkIntToScalar(fBitmaps[i].width());
}
- this->inval(NULL);
+ this->inval(nullptr);
}
private: