Remove top and bottom margins from TrayBubbleView

ui/views/bubble/tray_bubble_view.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/views/bubble/tray_bubble_view.h"
 
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Inset the arrow a bit from the edge.
 const int kArrowMinOffset = 20;
 const int kBubbleSpacing = 20;
@@ skipping 82 matching lines @@
   }
 
  private:
   views::View* owner_;
   views::View* anchor_;
   const int tray_arrow_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleBorder);
 };
 
+#if defined(OS_WIN) && !defined(USE_AURA)
 // Custom background for TrayBubbleView. Fills in the top and bottom margins
 // with appropriate background colors without overwriting the rounded corners.
 class TrayBubbleBackground : public views::Background {
  public:
   explicit TrayBubbleBackground(views::BubbleBorder* border,
                                 SkColor top_color,
                                 SkColor bottom_color)
       : border_(border),
         top_color_(top_color),
         bottom_color_(bottom_color),
@@ skipping 34 matching lines @@
   }
 
  private:
   views::BubbleBorder* border_;
   SkColor top_color_;
   SkColor bottom_color_;
   SkScalar radius_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleBackground);
 };
+#else
+class TrayBubbleContentMask : public ui::Layer, public ui::LayerDelegate {
+ public:
+  TrayBubbleContentMask(views::BubbleBorder* border)
+     : Layer(ui::LAYER_TEXTURED),
+       radius_(SkIntToScalar(border->GetBorderCornerRadius() - 1)) {
+    set_delegate(this);
+  }
+
+  // Overridden from LayerDelegate:
+  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
+    SkPath path;
+    path.addRoundRect(gfx::RectToSkRect(gfx::Rect(bounds().size())),
+                      radius_, radius_);
+    SkPaint paint;
+    paint.setAlpha(255);
+    paint.setStyle(SkPaint::kFill_Style);
+    canvas->DrawPath(path, paint);
+  }
+
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {
+  }
+
+  virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
+    return base::Closure();
+  }
+
+ private:
+  SkScalar radius_;
+
+  DISALLOW_COPY_AND_ASSIGN(TrayBubbleContentMask);
+};
+#endif  // defined(OS_WIN) && !defined(USE_AURA)
 
 // Custom layout for the bubble-view. Does the default box-layout if there is
 // enough height. Otherwise, makes sure the bottom rows are visible.
 class BottomAlignedBoxLayout : public views::BoxLayout {
  public:
   explicit BottomAlignedBoxLayout(TrayBubbleView* bubble_view)
       : views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0),
         bubble_view_(bubble_view) {
   }
 
@@ skipping 21 matching lines @@
   }
 
   TrayBubbleView* bubble_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BottomAlignedBoxLayout);
 };
 
 }  // namespace internal
 
 using internal::TrayBubbleBorder;
+#if defined(OS_WIN) && !defined(USE_AURA)
 using internal::TrayBubbleBackground;
+#else
+using internal::TrayBubbleContentMask;
+#endif
 using internal::BottomAlignedBoxLayout;
 
 // static
 const int TrayBubbleView::InitParams::kArrowDefaultOffset = -1;
 
 TrayBubbleView::InitParams::InitParams(AnchorType anchor_type,
                                        AnchorAlignment anchor_alignment,
                                        int bubble_width)
     : anchor_type(anchor_type),
       anchor_alignment(anchor_alignment),
       bubble_width(bubble_width),
       max_height(0),
       can_activate(false),
       close_on_deactivate(true),
+#if defined(OS_WIN) && !defined(USE_AURA)
       top_color(SK_ColorBLACK),
+#endif
       arrow_color(SK_ColorBLACK),
       arrow_location(views::BubbleBorder::NONE),
       arrow_offset(kArrowDefaultOffset),
       shadow(views::BubbleBorder::BIG_SHADOW) {
 }
 
 // static
 TrayBubbleView* TrayBubbleView::Create(gfx::NativeView parent_window,
                                        views::View* anchor,
                                        Delegate* delegate,
@@ skipping 17 matching lines @@
 }
 
 TrayBubbleView::TrayBubbleView(gfx::NativeView parent_window,
                                views::View* anchor,
                                Delegate* delegate,
                                const InitParams& init_params)
     : views::BubbleDelegateView(anchor, init_params.arrow_location),
       params_(init_params),
       delegate_(delegate),
       bubble_border_(NULL),
+#if defined(OS_WIN) && !defined(USE_AURA)
       bubble_background_(NULL),
+#endif
       is_gesture_dragging_(false) {
   set_parent_window(parent_window);
   set_notify_enter_exit_on_child(true);
   set_close_on_deactivate(init_params.close_on_deactivate);
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(true);
 
   bubble_border_ = new TrayBubbleBorder(this, anchor_view(), params_);
 
+#if defined(OS_WIN) && !defined(USE_AURA)
+  // On Windows non-aura, the bubble's top and bottom margins are painted by a
+  // custom background class that is aware of the bubble's rounded corners.
   bubble_background_ = new TrayBubbleBackground(
       bubble_border_, init_params.top_color, init_params.arrow_color);
-
-  // Inset the view on the top and bottom by the corner radius to avoid drawing
-  // over the the bubble corners.
   const int radius = bubble_background_->radius();
   set_margins(gfx::Insets(radius, 0, radius, 0));
+#else
+  // On all other platforms, the bubble's content is allowed to extend to the
+  // bubble's edges and a mask layer ensures that the bubble's rounded corners
+  // do not get overwritten.
+  bubble_content_mask_.reset(new TrayBubbleContentMask(bubble_border_));

[sky, 2012/11/07 15:30:37]

Can we instead use ClipPath when painting so that we don't need all the special
cases?

[bartfab (slow), 2012/11/07 15:34:06]

The problem is that the ash tray context menu contains animated layers. The
layer is painted once (creating a texture) and then composited without
re-painting. The clip path needs to be enforced while compositing the layer, not
when painting it.

+  set_margins(gfx::Insets());
+#endif  // defined(OS_WIN) && !defined(USE_AURA)
 }
 
 TrayBubbleView::~TrayBubbleView() {
   // Inform host items (models) that their views are being destroyed.
   if (delegate_)
     delegate_->BubbleViewDestroyed();
 }
 
 void TrayBubbleView::InitializeAndShowBubble() {
   // Must occur after call to BubbleDelegateView::CreateBubble().
   SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble_border_->UpdateArrowOffset();
 
+#if !defined(OS_WIN) || defined(USE_AURA)
+  layer()->parent()->SetMaskLayer(bubble_content_mask_.get());
+#endif
+
   Show();
   UpdateBubble();
 }
 
 void TrayBubbleView::UpdateBubble() {
   SizeToContents();
+#if !defined(OS_WIN) || defined(USE_AURA)
+  bubble_content_mask_->SetBounds(layer()->bounds());
+#endif
   GetWidget()->GetRootView()->SchedulePaint();
 }
 
 void TrayBubbleView::SetMaxHeight(int height) {
   params_.max_height = height;
   if (GetWidget())
     SizeToContents();
 }
 
 void TrayBubbleView::SetPaintArrow(bool paint_arrow) {
@@ skipping 20 matching lines @@
 
 bool TrayBubbleView::CanActivate() const {
   return params_.can_activate;
 }
 
 // Overridden to create BubbleFrameView and set a custom border and background.
 views::NonClientFrameView* TrayBubbleView::CreateNonClientFrameView(
     views::Widget* widget) {
   views::BubbleFrameView* bubble_frame_view =
       new views::BubbleFrameView(margins(), bubble_border_);
+#if defined(OS_WIN) && !defined(USE_AURA)
   bubble_frame_view->set_background(bubble_background_);
+#endif
   return bubble_frame_view;
 }
 
 bool TrayBubbleView::WidgetHasHitTestMask() const {
   return true;
 }
 
 void TrayBubbleView::GetWidgetHitTestMask(gfx::Path* mask) const {
   DCHECK(mask);
   mask->addRect(gfx::RectToSkRect(GetBubbleFrameView()->GetContentsBounds()));
@@ skipping 32 matching lines @@
                                           views::View* parent,
                                           views::View* child) {
   if (is_add && child == this) {
     parent->SetPaintToLayer(true);
     parent->SetFillsBoundsOpaquely(true);
     parent->layer()->SetMasksToBounds(true);
   }
 }
 
 }  // namespace views