| 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);
|
|
|