src/core/SkAdvancedTypefaceMetrics.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: src/core/SkAdvancedTypefaceMetrics.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: src/core/SkAdvancedTypefaceMetrics.cpp

diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp

index 81e98f36132ab7cf238df9f95db71cbd171e7c23..56a557c343f5113a5a5313b57f51adf65f3fd198 100644

--- a/src/core/SkAdvancedTypefaceMetrics.cpp

+++ b/src/core/SkAdvancedTypefaceMetrics.cpp

@@ -148,7 +148,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(

SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;

SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* curRange;

- SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = NULL;

+ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = nullptr;

Data lastAdvance = kInvalidAdvance;

int repeatedAdvances = 0;

int wildCardsInRun = 0;

@@ -168,7 +168,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(

for (int gId = firstIndex; gId <= lastIndex; gId++) {

Data advance = kInvalidAdvance;

if (gId < lastIndex) {

- // Get glyph id only when subset is NULL, or the id is in subset.

+ // Get glyph id only when subset is nullptr, or the id is in subset.

SkASSERT(!subsetGlyphIDs || (subsetIndex < subsetGlyphIDsLength &&

static_cast<uint32_t>(gId) <= subsetGlyphIDs[subsetIndex]));

if (!subsetGlyphIDs ||

« no previous file with comments | « src/core/SkAdvancedTypefaceMetrics.h ('k') | src/core/SkAnnotation.cpp » ('j') | no next file with comments »