cc: nine patch: add occlusion support

ui/wm/core/shadow.cc

Index: ui/wm/core/shadow.cc
diff --git a/ui/wm/core/shadow.cc b/ui/wm/core/shadow.cc
index a5f736ae08057ec362c72b4cc0c7f4d13d1be1f7..26ebde6ee3335b2b3bfa4756317c07c69d342543 100644
--- a/ui/wm/core/shadow.cc
+++ b/ui/wm/core/shadow.cc
@@ -28,6 +28,10 @@ const int kActiveInteriorInset = 64;
 const int kInactiveInteriorInset = 64;
 const int kSmallInteriorInset = 4;
 
+// Rounded corners are overdrawn on top of the window's content layer,
+// we need to exclude them from the occlusion area.
+const int kRoundedCornerRadius = 2;
+
 // Duration for opacity animation in milliseconds.
 const int kShadowAnimationDurationMs = 100;
 
@@ -182,12 +186,23 @@ void Shadow::UpdateLayerBounds() {
   int aperture = GetShadowApertureForStyle(style_);
   int aperture_x = std::min(aperture, layer_bounds.width() / 2);
   int aperture_y = std::min(aperture, layer_bounds.height() / 2);
-  shadow_layer_->UpdateNinePatchLayerAperture(
-      gfx::Rect(aperture_x, aperture_y,
-                image_size_.width() - aperture_x * 2,
-                image_size_.height() - aperture_y * 2));
+  gfx::Rect aperture_rect(aperture_x, aperture_y,
+                          image_size_.width() - aperture_x * 2,
+                          image_size_.height() - aperture_y * 2);
+
+  shadow_layer_->UpdateNinePatchLayerAperture(aperture_rect);
   shadow_layer_->UpdateNinePatchLayerBorder(
       gfx::Rect(aperture_x, aperture_y, aperture_x * 2, aperture_y * 2));
+
+  // The content bounds in the shadow's layer space are offsetted by
+  // |interior_inset_|. The occlusion area also has to be shrinked to
+  // allow rounded corners overdrawing on top of the window's content.
+  gfx::Rect content_bounds(
+      content_bounds_.x() + interior_inset_ + kRoundedCornerRadius,
+      content_bounds_.y() + interior_inset_ + kRoundedCornerRadius,
+      content_bounds_.width() - 2 * kRoundedCornerRadius,
+      content_bounds_.height() - 2 * kRoundedCornerRadius);
+  shadow_layer_->UpdateNinePatchOcclusion(content_bounds);
 }
 
 }  // namespace wm