Apply new MD shadows to CrOS tray bubbles.

ui/wm/core/shadow.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/shadow.h"
 
 #include "base/lazy_instance.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ skipping 114 matching lines @@
 
 void Shadow::RecreateShadowLayer() {
   shadow_layer_.reset(new ui::Layer(ui::LAYER_NINE_PATCH));
   shadow_layer_->set_name("Shadow");
   shadow_layer_->SetVisible(true);
   shadow_layer_->SetFillsBoundsOpaquely(false);
   layer()->Add(shadow_layer_.get());
 
   const ShadowDetails& details = GetDetailsForElevation(ElevationForStyle());
   shadow_layer_->UpdateNinePatchLayerImage(details.ninebox_image);
-  // The ninebox grid is defined in terms of the image size. The shadow blurs in
-  // both inward and outward directions from the edge of the contents, so the
-  // aperture goes further inside the image than the shadow margins (which
-  // represent exterior blur).
-  gfx::Rect aperture(details.ninebox_image.size());
-  gfx::Insets blur_region = gfx::ShadowValue::GetBlurRegion(details.values) +
-                            gfx::Insets(kRoundedCornerRadius);
-  aperture.Inset(blur_region);
-  shadow_layer_->UpdateNinePatchLayerAperture(aperture);
   UpdateLayerBounds();
 }
 
 void Shadow::UpdateLayerBounds() {
   const ShadowDetails& details = GetDetailsForElevation(ElevationForStyle());
   // Shadow margins are negative, so this expands outwards from
   // |content_bounds_|.
   const gfx::Insets margins = gfx::ShadowValue::GetMargin(details.values);
   gfx::Rect new_layer_bounds = content_bounds_;
   new_layer_bounds.Inset(margins);
@@ skipping 33 matching lines @@
   // larger than the shadow layer. When the shadow layer is too small, shrink
   // the dimensions proportionally.
   gfx::Insets blur_region = gfx::ShadowValue::GetBlurRegion(details.values) +
                             gfx::Insets(kRoundedCornerRadius);
   int border_w = std::min(blur_region.width(), shadow_layer_bounds.width());
   int border_x = border_w * blur_region.left() / blur_region.width();
   int border_h = std::min(blur_region.height(), shadow_layer_bounds.height());
   int border_y = border_h * blur_region.top() / blur_region.height();
   shadow_layer_->UpdateNinePatchLayerBorder(
       gfx::Rect(border_x, border_y, border_w, border_h));
+
+  // The ninebox grid is defined in terms of the image size. The shadow blurs in
+  // both inward and outward directions from the edge of the contents, so the
+  // aperture goes further inside the image than the shadow margins (which
+  // represent exterior blur).
+  gfx::Rect aperture(details.ninebox_image.size());
+  // The insets for the aperture are nominally |blur_region| but we need to
+  // resize them if the contents are too small.
+  // TODO(estade): by cutting out parts of ninebox, we lose the smooth
+  // horizontal or vertical transition. This isn't very noticeable, but we may
+  // need to address it by using a separate shadow layer for each ShadowValue,
+  // by adjusting the shadow for very small windows, or other means.
+  aperture.Inset(gfx::Insets(border_y, border_x, border_h - border_y,
+                             border_w - border_x));
+  shadow_layer_->UpdateNinePatchLayerAperture(aperture);
 }
 
 int Shadow::ElevationForStyle() {
   switch (style_) {
     case STYLE_ACTIVE:
       return 24;
     case STYLE_INACTIVE:
       return 8;
     case STYLE_SMALL:
       return 6;
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace wm