aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleClipDrawMatch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'samplecode/SampleClipDrawMatch.cpp')
-rw-r--r--samplecode/SampleClipDrawMatch.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/samplecode/SampleClipDrawMatch.cpp b/samplecode/SampleClipDrawMatch.cpp
index c79c87239d..502f34946b 100644
--- a/samplecode/SampleClipDrawMatch.cpp
+++ b/samplecode/SampleClipDrawMatch.cpp
@@ -141,17 +141,17 @@ protected:
SkUnichar uni;
if (SampleCode::CharQ(*evt, &uni)) {
switch (uni) {
- case '1': fGeom = kRect_Geometry; this->inval(NULL); return true;
- case '2': fGeom = kRRect_Geometry; this->inval(NULL); return true;
- case '3': fGeom = kCircle_Geometry; this->inval(NULL); return true;
- case '4': fGeom = kConvexPath_Geometry; this->inval(NULL); return true;
- case '5': fGeom = kConcavePath_Geometry; this->inval(NULL); return true;
- case '6': fGeom = kRectAndRect_Geometry; this->inval(NULL); return true;
- case '7': fGeom = kRectAndRRect_Geometry; this->inval(NULL); return true;
- case '8': fGeom = kRectAndConvex_Geometry; this->inval(NULL); return true;
- case '9': fGeom = kRectAndConcave_Geometry; this->inval(NULL); return true;
- case 'f': fSign = -fSign; this->inval(NULL); return true;
- case 't': fClipFirst = !fClipFirst; this->inval(NULL); return true;
+ case '1': fGeom = kRect_Geometry; this->inval(nullptr); return true;
+ case '2': fGeom = kRRect_Geometry; this->inval(nullptr); return true;
+ case '3': fGeom = kCircle_Geometry; this->inval(nullptr); return true;
+ case '4': fGeom = kConvexPath_Geometry; this->inval(nullptr); return true;
+ case '5': fGeom = kConcavePath_Geometry; this->inval(nullptr); return true;
+ case '6': fGeom = kRectAndRect_Geometry; this->inval(nullptr); return true;
+ case '7': fGeom = kRectAndRRect_Geometry; this->inval(nullptr); return true;
+ case '8': fGeom = kRectAndConvex_Geometry; this->inval(nullptr); return true;
+ case '9': fGeom = kRectAndConcave_Geometry; this->inval(nullptr); return true;
+ case 'f': fSign = -fSign; this->inval(nullptr); return true;
+ case 't': fClipFirst = !fClipFirst; this->inval(nullptr); return true;
default: break;
}
}
@@ -240,7 +240,7 @@ protected:
this->drawGeometry(canvas, offset, false);
canvas->restoreToCount(saveCount);
- this->inval(NULL);
+ this->inval(nullptr);
}
private: