| Index: cc/test/fake_picture_layer_tiling_client.cc
|
| diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
|
| index ce46c917615fb04a15275c2f8c1b9e5668676877..9fc4b582cfdeeea6806b2f9b4c4f2a19e2f1c934 100644
|
| --- a/cc/test/fake_picture_layer_tiling_client.cc
|
| +++ b/cc/test/fake_picture_layer_tiling_client.cc
|
| @@ -14,8 +14,8 @@ namespace cc {
|
| FakePictureLayerTilingClient::FakePictureLayerTilingClient()
|
| : tile_manager_(new FakeTileManager(&tile_manager_client_)),
|
| pile_(FakePicturePileImpl::CreateInfiniteFilledPile()),
|
| - twin_tiling_(NULL),
|
| - recycled_twin_tiling_(NULL),
|
| + twin_tiling_(nullptr),
|
| + recycled_twin_tiling_(nullptr),
|
| allow_create_tile_(true),
|
| max_tiles_for_interest_area_(10000),
|
| skewport_target_time_in_seconds_(1.0f),
|
| @@ -29,8 +29,8 @@ FakePictureLayerTilingClient::FakePictureLayerTilingClient(
|
| tile_manager_(
|
| new FakeTileManager(&tile_manager_client_, resource_pool_.get())),
|
| pile_(FakePicturePileImpl::CreateInfiniteFilledPile()),
|
| - twin_tiling_(NULL),
|
| - recycled_twin_tiling_(NULL),
|
| + twin_tiling_(nullptr),
|
| + recycled_twin_tiling_(nullptr),
|
| allow_create_tile_(true),
|
| max_tiles_for_interest_area_(10000),
|
| skewport_target_time_in_seconds_(1.0f) {
|
|
|