Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Side by Side Diff: tests/MetaDataTest.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/MemsetTest.cpp ('k') | tests/MipMapTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 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 "SkMetaData.h" 8 #include "SkMetaData.h"
9 #include "Test.h" 9 #include "Test.h"
10 #include "SkRefCnt.h" 10 #include "SkRefCnt.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 { "scalar", SkMetaData::kScalar_Type, 1 }, 77 { "scalar", SkMetaData::kScalar_Type, 1 },
78 { "ptr", SkMetaData::kPtr_Type, 1 }, 78 { "ptr", SkMetaData::kPtr_Type, 1 },
79 { "hello", SkMetaData::kString_Type, sizeof("world") }, 79 { "hello", SkMetaData::kString_Type, sizeof("world") },
80 { "true", SkMetaData::kBool_Type, 1 }, 80 { "true", SkMetaData::kBool_Type, 1 },
81 { "false", SkMetaData::kBool_Type, 1 } 81 { "false", SkMetaData::kBool_Type, 1 }
82 }; 82 };
83 83
84 int loop = 0; 84 int loop = 0;
85 int count; 85 int count;
86 SkMetaData::Type t; 86 SkMetaData::Type t;
87 while ((name = iter.next(&t, &count)) != NULL) 87 while ((name = iter.next(&t, &count)) != nullptr)
88 { 88 {
89 int match = 0; 89 int match = 0;
90 for (unsigned i = 0; i < SK_ARRAY_COUNT(gElems); i++) 90 for (unsigned i = 0; i < SK_ARRAY_COUNT(gElems); i++)
91 { 91 {
92 if (!strcmp(name, gElems[i].fName)) 92 if (!strcmp(name, gElems[i].fName))
93 { 93 {
94 match += 1; 94 match += 1;
95 REPORTER_ASSERT(reporter, gElems[i].fType == t); 95 REPORTER_ASSERT(reporter, gElems[i].fType == t);
96 REPORTER_ASSERT(reporter, gElems[i].fCount == count); 96 REPORTER_ASSERT(reporter, gElems[i].fCount == count);
97 } 97 }
(...skipping 10 matching lines...) Expand all
108 REPORTER_ASSERT(reporter, m1.removeBool("false")); 108 REPORTER_ASSERT(reporter, m1.removeBool("false"));
109 109
110 REPORTER_ASSERT(reporter, !m1.findS32("int")); 110 REPORTER_ASSERT(reporter, !m1.findS32("int"));
111 REPORTER_ASSERT(reporter, !m1.findScalar("scalar")); 111 REPORTER_ASSERT(reporter, !m1.findScalar("scalar"));
112 REPORTER_ASSERT(reporter, !m1.findString("hello")); 112 REPORTER_ASSERT(reporter, !m1.findString("hello"));
113 REPORTER_ASSERT(reporter, !m1.findBool("true")); 113 REPORTER_ASSERT(reporter, !m1.findBool("true"));
114 REPORTER_ASSERT(reporter, !m1.findBool("false")); 114 REPORTER_ASSERT(reporter, !m1.findBool("false"));
115 115
116 test_ptrs(reporter); 116 test_ptrs(reporter);
117 } 117 }
OLDNEW
« no previous file with comments | « tests/MemsetTest.cpp ('k') | tests/MipMapTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698