Retain tray bubble's rounded corners when the bubble animates out

ui/compositor/layer.cc

Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 2da468a5b48ca5f69c8ebe98ead61cfa42ba8b11..0c0032e33ca07025c0f3ba34cf343f531f38f906 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -56,7 +56,6 @@ Layer::Layer()
       layer_brightness_(0.0f),
       layer_grayscale_(0.0f),
       layer_inverted_(false),
-      layer_mask_(NULL),
       layer_mask_back_link_(NULL),
       zoom_(1),
       zoom_inset_(0),
@@ -64,6 +63,7 @@ Layer::Layer()
       cc_layer_(NULL),
       scale_content_(true),
       device_scale_factor_(1.0f) {
+  layer_mask_.reset(NULL);

[Jun Mukai, 2013/10/04 01:39:36]

nit: just reset(), NULL is not necessary

[piman, 2013/10/04 03:44:39]

Just remove. The default scoped_ptr constructor does the right thing.

[michaelpg, 2013/10/04 05:56:41]

Done.

   CreateWebLayer();
 }
 
@@ -80,7 +80,6 @@ Layer::Layer(LayerType type)
       layer_brightness_(0.0f),
       layer_grayscale_(0.0f),
       layer_inverted_(false),
-      layer_mask_(NULL),
       layer_mask_back_link_(NULL),
       zoom_(1),
       zoom_inset_(0),
@@ -88,6 +87,7 @@ Layer::Layer(LayerType type)
       cc_layer_(NULL),
       scale_content_(true),
       device_scale_factor_(1.0f) {
+  layer_mask_.reset(NULL);

[Jun Mukai, 2013/10/04 01:39:36]

ditto

[michaelpg, 2013/10/04 05:56:41]

Removed

   CreateWebLayer();
 }
 
@@ -102,7 +102,7 @@ Layer::~Layer() {
     compositor_->SetRootLayer(NULL);
   if (parent_)
     parent_->Remove(this);
-  if (layer_mask_)
+  if (layer_mask_.get())
     SetMaskLayer(NULL);
   if (layer_mask_back_link_)

[Jun Mukai, 2013/10/04 01:39:36]

this is weird, if the layer_mask_ is owned by the layer, layer_mask_ cannot be
released by someone else. It means that back_link_ isn't necessary at all.

[piman, 2013/10/04 03:44:39]

Agreed. Please remove.

[michaelpg, 2013/10/04 05:56:41]

Done.

     layer_mask_back_link_->SetMaskLayer(NULL);
@@ -291,9 +291,9 @@ void Layer::SetMaskLayer(Layer* layer_mask) {
     return;
   // We need to de-reference the currently linked object so that no problem
   // arises if the mask layer gets deleted before this object.
-  if (layer_mask_)
+  if (layer_mask_.get())
     layer_mask_->layer_mask_back_link_ = NULL;
-  layer_mask_ = layer_mask;
+  layer_mask_.reset(layer_mask);
   cc_layer_->SetMaskLayer(
       layer_mask ? layer_mask->cc_layer() : NULL);
   // We need to reference the linked object so that it can properly break the
@@ -623,7 +623,7 @@ 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_)
+  if (layer_mask_.get())
     layer_mask_->OnDeviceScaleFactorChanged(device_scale_factor);
 }