| Index: cc/resources/tile_manager_perftest.cc
|
| diff --git a/cc/resources/tile_manager_perftest.cc b/cc/resources/tile_manager_perftest.cc
|
| index 38290de30d85b4453f0fbb9ebcd90472f43f6024..e83596c9ba3d8bc82db9f6e3224f28915f2ab916 100644
|
| --- a/cc/resources/tile_manager_perftest.cc
|
| +++ b/cc/resources/tile_manager_perftest.cc
|
| @@ -71,7 +71,7 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient {
|
| // Overridden from RasterizerTaskClient:
|
| virtual scoped_ptr<RasterBuffer> AcquireBufferForRaster(
|
| const Resource* resource) OVERRIDE {
|
| - return scoped_ptr<RasterBuffer>();
|
| + return nullptr;
|
| }
|
| virtual void ReleaseBufferForRaster(
|
| scoped_ptr<RasterBuffer> buffer) OVERRIDE {}
|
| @@ -119,8 +119,7 @@ class TileManagerPerfTest : public testing::Test {
|
| }
|
|
|
| virtual void InitializeRenderer() {
|
| - host_impl_.InitializeRenderer(
|
| - FakeOutputSurface::Create3d().PassAs<OutputSurface>());
|
| + host_impl_.InitializeRenderer(FakeOutputSurface::Create3d().Pass());
|
| tile_manager()->SetRasterizerForTesting(g_fake_rasterizer.Pointer());
|
| }
|
|
|
| @@ -166,7 +165,7 @@ class TileManagerPerfTest : public testing::Test {
|
| scoped_ptr<FakePictureLayerImpl> pending_layer =
|
| FakePictureLayerImpl::CreateWithPile(pending_tree, id_, pile);
|
| pending_layer->SetDrawsContent(true);
|
| - pending_tree->SetRootLayer(pending_layer.PassAs<LayerImpl>());
|
| + pending_tree->SetRootLayer(pending_layer.Pass());
|
|
|
| pending_root_layer_ = static_cast<FakePictureLayerImpl*>(
|
| host_impl_.pending_tree()->LayerById(id_));
|
| @@ -362,7 +361,7 @@ class TileManagerPerfTest : public testing::Test {
|
| host_impl_.pending_tree(), next_id, picture_pile_);
|
| layer->SetBounds(layer_bounds);
|
| layers.push_back(layer.get());
|
| - pending_root_layer_->AddChild(layer.PassAs<LayerImpl>());
|
| + pending_root_layer_->AddChild(layer.Pass());
|
|
|
| FakePictureLayerImpl* fake_layer =
|
| static_cast<FakePictureLayerImpl*>(layers.back());
|
|
|