Index: gpu/ipc/service/ca_layer_partial_damage_tree_mac.mm |
diff --git a/gpu/ipc/service/ca_layer_partial_damage_tree_mac.mm b/gpu/ipc/service/ca_layer_partial_damage_tree_mac.mm |
index 25cd39dd6561ac9ef4d6e7252a71b4ade73f55a7..65427b2b4879cdae763c00ab95d1575e621338df 100644 |
--- a/gpu/ipc/service/ca_layer_partial_damage_tree_mac.mm |
+++ b/gpu/ipc/service/ca_layer_partial_damage_tree_mac.mm |
@@ -125,7 +125,7 @@ void CALayerPartialDamageTree::UpdatePartialDamagePlanes( |
// Find the last partial damage plane to re-use the CALayer from. Grow the |
// new rect for this layer to include this damage, and all nearby partial |
// damage layers. |
- scoped_ptr<OverlayPlane> plane_for_swap; |
+ std::unique_ptr<OverlayPlane> plane_for_swap; |
{ |
auto plane_to_reuse_iter = old_tree->partial_damage_planes_.end(); |
gfx::Rect plane_to_reuse_enlarged_pixel_damage_rect; |
@@ -207,7 +207,7 @@ void CALayerPartialDamageTree::UpdatePartialDamagePlanes( |
} |
void CALayerPartialDamageTree::UpdateRootAndPartialDamagePlanes( |
- scoped_ptr<CALayerPartialDamageTree> old_tree, |
+ std::unique_ptr<CALayerPartialDamageTree> old_tree, |
const gfx::Rect& pixel_damage_rect) { |
// First update the partial damage tree. |
UpdatePartialDamagePlanes(old_tree.get(), pixel_damage_rect); |
@@ -276,7 +276,7 @@ CALayerPartialDamageTree::RootLayerIOSurface() { |
void CALayerPartialDamageTree::CommitCALayers( |
CALayer* superlayer, |
- scoped_ptr<CALayerPartialDamageTree> old_tree, |
+ std::unique_ptr<CALayerPartialDamageTree> old_tree, |
float scale_factor, |
const gfx::Rect& pixel_damage_rect) { |
TRACE_EVENT0("gpu", "CALayerPartialDamageTree::CommitCALayers"); |