| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index b87cb6601e9282549572fec69cf4f4f0314b8832..0063e879fe924bb7437122fff844bc1d208e9504 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -630,9 +630,9 @@
|
| nine_patch_layer_->SetAperture(aperture_in_pixel);
|
| }
|
|
|
| -void Layer::UpdateNinePatchOcclusion(const gfx::Rect& occlusion) {
|
| +void Layer::UpdateNinePatchLayerBorder(const gfx::Rect& border) {
|
| DCHECK(type_ == LAYER_NINE_PATCH && nine_patch_layer_.get());
|
| - nine_patch_layer_->SetLayerOcclusion(occlusion);
|
| + nine_patch_layer_->SetBorder(border);
|
| }
|
|
|
| void Layer::SetColor(SkColor color) { GetAnimator()->SetColor(color); }
|
| @@ -822,7 +822,6 @@
|
| 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);
|
|
|
|
|