tests/TypefaceTest.cpp - Issue 1316233002: Style Change: NULL->nullptr

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: tests/TypefaceTest.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, 3 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 unified diff | Download patch

« no previous file with comments | « tests/TextureCompressionTest.cpp ('k') | tests/UtilsTest.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2013 Google Inc.	2 * Copyright 2013 Google Inc.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8 #include "SkTypeface.h"	8 #include "SkTypeface.h"

9 #include "Test.h"	9 #include "Test.h"

10	10

11 DEF_TEST(Typeface, reporter) {	11 DEF_TEST(Typeface, reporter) {

12	12

13 SkAutoTUnref<SkTypeface> t1(SkTypeface::CreateFromName(NULL, SkTypeface::kNo rmal));	13 SkAutoTUnref<SkTypeface> t1(SkTypeface::CreateFromName(nullptr, SkTypeface:: kNormal));

14 SkAutoTUnref<SkTypeface> t2(SkTypeface::RefDefault(SkTypeface::kNormal));	14 SkAutoTUnref<SkTypeface> t2(SkTypeface::RefDefault(SkTypeface::kNormal));

15	15

16 REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), t2.get()));	16 REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), t2.get()));

17 REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t1.get()));	17 REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t1.get()));

18 REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t2.get()));	18 REPORTER_ASSERT(reporter, SkTypeface::Equal(0, t2.get()));

19 REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), 0));	19 REPORTER_ASSERT(reporter, SkTypeface::Equal(t1.get(), 0));

20 REPORTER_ASSERT(reporter, SkTypeface::Equal(t2.get(), 0));	20 REPORTER_ASSERT(reporter, SkTypeface::Equal(t2.get(), 0));

21	21

22 #ifdef SK_BUILD_FOR_ANDROID	22 #ifdef SK_BUILD_FOR_ANDROID

23 SkAutoTUnref<SkTypeface> t3(SkTypeface::CreateFromName("non-existent-font", SkTypeface::kNormal));	23 SkAutoTUnref<SkTypeface> t3(SkTypeface::CreateFromName("non-existent-font", SkTypeface::kNormal));

24 REPORTER_ASSERT(reporter, NULL == t3.get());	24 REPORTER_ASSERT(reporter, nullptr == t3.get());

25 #endif	25 #endif

26 }	26 }

OLD	NEW