Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: ui/compositor/layer.cc

Issue 1889153002: cc: nine patch: add occlusion support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove std::move Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 0063e879fe924bb7437122fff844bc1d208e9504..b87cb6601e9282549572fec69cf4f4f0314b8832 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -630,9 +630,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& occlusion) {
DCHECK(type_ == LAYER_NINE_PATCH && nine_patch_layer_.get());
- nine_patch_layer_->SetBorder(border);
+ nine_patch_layer_->SetLayerOcclusion(occlusion);
}
void Layer::SetColor(SkColor color) { GetAnimator()->SetColor(color); }
@@ -822,6 +822,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);

Powered by Google App Engine
This is Rietveld 408576698