| Index: cc/trees/tree_synchronizer.cc
|
| diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
|
| index 1faf0e04e679d468b91ab49ef5e209794d8abea5..d17f0175b9d9cbd10491b57ba632814760366246 100644
|
| --- a/cc/trees/tree_synchronizer.cc
|
| +++ b/cc/trees/tree_synchronizer.cc
|
| @@ -105,7 +105,7 @@ scoped_ptr<LayerImpl> SynchronizeTreesRecursiveInternal(
|
| LayerType* layer,
|
| LayerTreeImpl* tree_impl) {
|
| if (!layer)
|
| - return scoped_ptr<LayerImpl>();
|
| + return nullptr;
|
|
|
| scoped_ptr<LayerImpl> layer_impl =
|
| ReuseOrCreateLayerImpl(new_layers, old_layers, layer, tree_impl);
|
|
|