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

Unified Diff: cc/resources/picture_layer_tiling_perftest.cc

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: cc/resources/picture_layer_tiling_perftest.cc
diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc
index 52d4b163f768cd8647dea48845b388fcad30e9a1..cdf5cf41ca44af40745667e2e8e2e5fb248c094c 100644
--- a/cc/resources/picture_layer_tiling_perftest.cc
+++ b/cc/resources/picture_layer_tiling_perftest.cc
@@ -36,7 +36,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -52,9 +52,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
picture_layer_tiling_->CreateAllTilesForTesting();
}
- virtual void TearDown() override {
- picture_layer_tiling_.reset(NULL);
- }
+ virtual void TearDown() override { picture_layer_tiling_.reset(nullptr); }
void RunInvalidateTest(const std::string& test_name, const Region& region) {
timer_.Reset();
@@ -165,7 +163,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
picture_layer_tiling_.get());
while (count--) {
ASSERT_TRUE(it) << "count: " << count;
- ASSERT_TRUE(*it != NULL) << "count: " << count;
+ ASSERT_TRUE(*it != nullptr) << "count: " << count;
++it;
}
timer_.NextLap();
@@ -245,7 +243,7 @@ class PictureLayerTilingPerfTest : public testing::Test {
PictureLayerTiling::EVENTUALLY);
while (count--) {
ASSERT_TRUE(it) << "count: " << count;
- ASSERT_TRUE(*it != NULL) << "count: " << count;
+ ASSERT_TRUE(*it != nullptr) << "count: " << count;
++it;
}
priority_count = (priority_count + 1) % arraysize(priorities);

Powered by Google App Engine
This is Rietveld 408576698