gm/strokefill.cpp - Issue 1316233002: Style Change: NULL->nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/strokefill.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:

Index: gm/strokefill.cpp

diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp

index 4e8eaffcca7a454c939ec271bb0ed5147843a60f..e8878b5e3bba7a0109cf4ef87d9dc72655383337 100644

--- a/gm/strokefill.cpp

+++ b/gm/strokefill.cpp

@@ -307,7 +307,7 @@ protected:

SkASSERT(SkPathPriv::CheapIsFirstDirection(path2, SkPathPriv::kCCW_FirstDirection));

path2.reset();

- SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path2, NULL));

+ SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path2, nullptr));

path2.addCircle(x + SkIntToScalar(360), y + SkIntToScalar(200), SkIntToScalar(50), SkPath::kCW_Direction);

SkASSERT(SkPathPriv::CheapIsFirstDirection(path2, SkPathPriv::kCW_FirstDirection));

canvas->drawPath(path2, paint);

@@ -333,7 +333,7 @@ protected:

r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280),

SkIntToScalar(100), SkIntToScalar(100));

path4.reset();

- SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, NULL));

+ SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));

path4.addRect(r, SkPath::kCCW_Direction);

SkASSERT(SkPathPriv::CheapIsFirstDirection(path4, SkPathPriv::kCCW_FirstDirection));

path4.moveTo(0, 0); // test for crbug.com/247770

@@ -342,7 +342,7 @@ protected:

r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280),

SkIntToScalar(100), SkIntToScalar(100));

path4.reset();

- SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, NULL));

+ SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));

path4.addRect(r, SkPath::kCW_Direction);

SkASSERT(SkPathPriv::CheapIsFirstDirection(path4, SkPathPriv::kCW_FirstDirection));

path4.moveTo(0, 0); // test for crbug.com/247770

« no previous file with comments | « gm/srcmode.cpp ('k') | gm/surface.cpp » ('j') | no next file with comments »