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

Unified Diff: ui/compositor/layer.cc

Issue 11293124: Remove top and bottom margins from TrayBubbleView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit addressed. Created 8 years, 1 month 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
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ui/message_center/message_bubble_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 2a88db500fe5b74141d8dddd174b02b8638ba6b6..c3ddc84a46718c3089fda7c46f5ef784a8b8dcdd 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -295,8 +295,10 @@ void Layer::SetMaskLayer(Layer* layer_mask) {
layer_mask ? layer_mask->web_layer() : NULL);
// We need to reference the linked object so that it can properly break the
// link to us when it gets deleted.
- if (layer_mask)
+ if (layer_mask) {
layer_mask->layer_mask_back_link_ = this;
+ layer_mask->OnDeviceScaleFactorChanged(device_scale_factor_);
+ }
}
void Layer::SetLayerFilters() {
@@ -491,6 +493,8 @@ void Layer::OnDeviceScaleFactorChanged(float device_scale_factor) {
delegate_->OnDeviceScaleFactorChanged(device_scale_factor);
for (size_t i = 0; i < children_.size(); ++i)
children_[i]->OnDeviceScaleFactorChanged(device_scale_factor);
+ if (layer_mask_)
+ layer_mask_->OnDeviceScaleFactorChanged(device_scale_factor);
}
void Layer::paintContents(WebKit::WebCanvas* web_canvas,
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ui/message_center/message_bubble_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698