Address some bubble clipping issues

ui/views/bubble/bubble_frame_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/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
 #include "ui/base/default_style.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 102 matching lines @@
   }
   return client_bounds;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Size size(GetSizeForClientSize(client_bounds.size()));
   return bubble_border_->GetBounds(gfx::Rect(), size);
 }
 
+bool BubbleFrameView::GetClientMask(const gfx::Size& size,
+                                    gfx::Path* path) const {
+  const int radius = bubble_border_->GetBorderCornerRadius();
+  path->addRoundRect(gfx::RectToSkRect(gfx::Rect(gfx::Point(), size)), radius,
+                     radius);
+  return true;
+}
+
 int BubbleFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
   if (close_->visible() && close_->GetMirroredBounds().Contains(point))
     return HTCLOSE;
 
   // Allow dialogs to show the system menu and be dragged.
   if (GetWidget()->widget_delegate()->AsDialogDelegate() &&
       !GetWidget()->widget_delegate()->AsBubbleDialogDelegate()) {
     gfx::Rect sys_rect(0, 0, title_->x(), title_->y());
@@ skipping 63 matching lines @@
   title_->SetText(GetWidget()->widget_delegate()->GetWindowTitle());
   title_->SetVisible(GetWidget()->widget_delegate()->ShouldShowWindowTitle());
 }
 
 void BubbleFrameView::SizeConstraintsChanged() {}
 
 void BubbleFrameView::SetTitleFontList(const gfx::FontList& font_list) {
   title_->SetFontList(font_list);
 }
 
+const char* BubbleFrameView::GetClassName() const {
+  return kViewClassName;
+}
+
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
 
   const int icon_height = title_icon_->GetPreferredSize().height();
   const int label_height = title_->GetPreferredSize().height();
   const bool has_title = icon_height > 0 || label_height > 0;
   const int title_padding = has_title ? title_margins_.height() : 0;
   const int title_height = std::max(icon_height, label_height) + title_padding;
   const int close_height = close_->visible() ? close_->height() : 0;
   insets += gfx::Insets(std::max(title_height, close_height), 0, 0, 0);
@@ skipping 80 matching lines @@
 
   if (footnote_container_) {
     gfx::Rect local_bounds = GetContentsBounds();
     int height = footnote_container_->GetHeightForWidth(local_bounds.width());
     footnote_container_->SetBounds(local_bounds.x(),
                                    local_bounds.bottom() - height,
                                    local_bounds.width(), height);
   }
 }
 
-const char* BubbleFrameView::GetClassName() const {
-  return kViewClassName;
-}
-
 void BubbleFrameView::OnThemeChanged() {
   UpdateWindowTitle();
   ResetWindowControls();
   UpdateWindowIcon();
 }
 
 void BubbleFrameView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (bubble_border_ && bubble_border_->use_theme_background_color()) {
     bubble_border_->set_background_color(GetNativeTheme()->
         GetSystemColor(ui::NativeTheme::kColorId_DialogBackground));
     SchedulePaint();
   }
 }
 
+void BubbleFrameView::OnPaint(gfx::Canvas* canvas) {
+  OnPaintBackground(canvas);
+  // Border comes after children.
+}
+
+void BubbleFrameView::PaintChildren(const ui::PaintContext& context) {
+  NonClientFrameView::PaintChildren(context);
+
+  ui::PaintCache paint_cache;
+  ui::PaintRecorder recorder(context, size(), &paint_cache);
+  OnPaintBorder(recorder.canvas());
+}
+
 void BubbleFrameView::ButtonPressed(Button* sender, const ui::Event& event) {
   if (sender == close_) {
     close_button_clicked_ = true;
     GetWidget()->Close();
   }
 }
 
 void BubbleFrameView::SetBubbleBorder(scoped_ptr<BubbleBorder> border) {
   bubble_border_ = border.get();
   SetBorder(std::move(border));
@@ skipping 141 matching lines @@
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
   if (footnote_container_)
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views