Index: ui/compositor/layer.cc |
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc |
index 0f83cb6000139edde5dbbeb375542442bb8f0306..05aff05f03a139488b26a631313a9346f5714147 100644 |
--- a/ui/compositor/layer.cc |
+++ b/ui/compositor/layer.cc |
@@ -629,9 +629,9 @@ void Layer::UpdateNinePatchLayerAperture(const gfx::Rect& aperture_in_dip) { |
nine_patch_layer_->SetAperture(aperture_in_pixel); |
} |
-void Layer::UpdateNinePatchLayerBorder(const gfx::Rect& border) { |
+void Layer::UpdateNinePatchOcclusion(const gfx::Rect& rect) { |
DCHECK(type_ == LAYER_NINE_PATCH && nine_patch_layer_.get()); |
- nine_patch_layer_->SetBorder(border); |
+ nine_patch_layer_->SetLayerOcclusion(rect); |
} |
void Layer::SetColor(SkColor color) { GetAnimator()->SetColor(color); } |
@@ -820,6 +820,7 @@ void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { |
above ? |
(child_i < other_i ? other_i : other_i + 1) : |
(child_i < other_i ? other_i - 1 : other_i); |
+ |
children_.erase(children_.begin() + child_i); |
children_.insert(children_.begin() + dest_i, child); |