[MD] Fix clipping of infobar child elements (particularly close button).

chrome/browser/ui/views/infobars/infobar_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 "chrome/browser/ui/views/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 61 matching lines @@
 
 
 // InfoBarView ----------------------------------------------------------------
 
 // static
 const int InfoBarView::kButtonButtonSpacing = views::kRelatedButtonHSpacing;
 const int InfoBarView::kEndOfLabelSpacing = views::kItemLabelSpacing;
 
 InfoBarView::InfoBarView(scoped_ptr<infobars::InfoBarDelegate> delegate)
     : infobars::InfoBar(std::move(delegate)),
-      views::ExternalFocusTracker(this, NULL),
-      icon_(NULL),
-      close_button_(NULL) {
+      views::ExternalFocusTracker(this, nullptr),
+      child_container_(new views::View()),
+      icon_(nullptr),
+      close_button_(nullptr) {
   set_owned_by_client();  // InfoBar deletes itself at the appropriate time.
   set_background(
       new InfoBarBackground(infobars::InfoBar::delegate()->GetInfoBarType()));
+
+  AddChildView(child_container_);
+
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    child_container_->SetPaintToLayer(true);
+    child_container_->layer()->SetMasksToBounds(true);
+    // Since MD doesn't use a gradient, we can set a solid bg color.
+    child_container_->set_background(
+        views::Background::CreateSolidBackground(infobars::InfoBar::GetTopColor(
+            infobars::InfoBar::delegate()->GetInfoBarType())));
+  }
 }
 
 InfoBarView::~InfoBarView() {
   // We should have closed any open menus in PlatformSpecificHide(), then
   // subclasses' RunMenu() functions should have prevented opening any new ones
   // once we became unowned.
   DCHECK(!menu_runner_.get());
 }
 
 views::Label* InfoBarView::CreateLabel(const base::string16& text) const {
@@ skipping 103 matching lines @@
       fill_path_.close();
     }
   }
   if (bar_height()) {
     fill_path_.addRect(
         0.0, SkIntToScalar(arrow_height()), SkIntToScalar(width()),
         SkIntToScalar(
             height() - InfoBarContainerDelegate::kSeparatorLineHeight));
   }
 
+  child_container_->SetBounds(0, arrow_height(), width(), bar_height());
+  // |child_container_| should be the only child.
+  DCHECK_EQ(1, child_count());
+
+  // Even though other views are technically grandchildren, we'll lay them out
+  // here on behalf of |child_container_|.
   int start_x = kEdgeItemPadding;
   if (icon_ != NULL) {
     icon_->SetPosition(gfx::Point(start_x, OffsetY(icon_)));
     start_x = icon_->bounds().right() + kIconToLabelSpacing;
   }
 
   int content_minimum_width = ContentMinimumWidth();
   close_button_->SetPosition(gfx::Point(
       std::max(
           start_x + content_minimum_width +
               ((content_minimum_width > 0) ? kBeforeCloseButtonSpacing : 0),
           width() - kEdgeItemPadding - close_button_->width()),
       OffsetY(close_button_)));
 }
 
 void InfoBarView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   View::ViewHierarchyChanged(details);
 
   if (details.is_add && (details.child == this) && (close_button_ == NULL)) {
     gfx::Image image = delegate()->GetIcon();
     if (!image.IsEmpty()) {
       icon_ = new views::ImageView;
       icon_->SetImage(image.ToImageSkia());
       icon_->SizeToPreferredSize();
-      AddChildView(icon_);
+      child_container_->AddChildView(icon_);
     }
 
     if (ui::MaterialDesignController::IsModeMaterial()) {
       BarControlButton* close = new BarControlButton(this);
       close->SetIcon(gfx::VectorIconId::BAR_CLOSE,
                      base::Bind(&GetInfobarTextColor));
       close->set_request_focus_on_press(false);
       close_button_ = close;
     } else {
       close_button_ = new views::ImageButton(this);
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                               rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                               rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                               rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia());
     }
     close_button_->SizeToPreferredSize();
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     close_button_->SetFocusable(true);
-    AddChildView(close_button_);
+    child_container_->AddChildView(close_button_);
   } else if ((close_button_ != NULL) && (details.parent == this) &&
       (details.child != close_button_) && (close_button_->parent() == this) &&
       (child_at(child_count() - 1) != close_button_)) {
     // For accessibility, ensure the close button is the last child view.
     RemoveChildView(close_button_);
-    AddChildView(close_button_);
+    child_container_->AddChildView(close_button_);
   }
 
   // Ensure the infobar is tall enough to display its contents.
   int height = ui::MaterialDesignController::IsModeMaterial()
                    ? InfoBarContainerDelegate::kDefaultBarTargetHeightMd
                    : InfoBarContainerDelegate::kDefaultBarTargetHeight;
   const int kMinimumVerticalPadding = 6;
   for (int i = 0; i < child_count(); ++i) {
     const int child_height = child_at(i)->height();
     height = std::max(height, child_height + kMinimumVerticalPadding);
   }
   SetBarTargetHeight(height);
 }
 
-void InfoBarView::PaintChildren(const ui::PaintContext& context) {
-  // TODO(scr): This really should be the |fill_path_|, but the clipPath seems
-  // broken on non-Windows platforms (crbug.com/75154). For now, just clip to
-  // the bar bounds.
-  //
-  // canvas->sk_canvas()->clipPath(fill_path_);
-  DCHECK_EQ(total_height(), height())
-      << "Infobar piecewise heights do not match overall height";
-  ui::ClipRecorder clip_recorder(context);
-  clip_recorder.ClipRect(gfx::Rect(0, arrow_height(), width(), bar_height()));
-  views::View::PaintChildren(context);
-}
-
 void InfoBarView::ButtonPressed(views::Button* sender,
                                 const ui::Event& event) {
   if (!owner())
     return;  // We're closing; don't call anything, it might access the owner.
   if (sender == close_button_) {
     delegate()->InfoBarDismissed();
     RemoveSelf();
   }
 }
 
 int InfoBarView::ContentMinimumWidth() const {
   return 0;
 }
 
 int InfoBarView::StartX() const {
   // Ensure we don't return a value greater than EndX(), so children can safely
   // set something's width to "EndX() - StartX()" without risking that being
   // negative.
   return std::min(EndX(), (icon_ != NULL) ?
       (icon_->bounds().right() + kIconToLabelSpacing) : kEdgeItemPadding);
 }
 
 int InfoBarView::EndX() const {
   return close_button_->x() - kBeforeCloseButtonSpacing;
 }
 
 int InfoBarView::OffsetY(views::View* view) const {
-  return arrow_height() +
-      std::max((bar_target_height() - view->height()) / 2, 0) -
-      (bar_target_height() - bar_height());
+  return std::max((bar_target_height() - view->height()) / 2, 0) -
+         (bar_target_height() - bar_height());
 }
 
 const infobars::InfoBarContainer::Delegate* InfoBarView::container_delegate()
     const {
   const infobars::InfoBarContainer* infobar_container = container();
   return infobar_container ? infobar_container->delegate() : NULL;
 }
 
 void InfoBarView::RunMenuAt(ui::MenuModel* menu_model,
                             views::MenuButton* button,
                             views::MenuAnchorPosition anchor) {
   DCHECK(owner());  // We'd better not open any menus while we're closing.
   gfx::Point screen_point;
   views::View::ConvertPointToScreen(button, &screen_point);
   menu_runner_.reset(
       new views::MenuRunner(menu_model, views::MenuRunner::HAS_MNEMONICS));
   // Ignore the result since we don't need to handle a deleted menu specially.
   ignore_result(menu_runner_->RunMenuAt(GetWidget(),
                                         button,
                                         gfx::Rect(screen_point, button->size()),
                                         anchor,
                                         ui::MENU_SOURCE_NONE));
 }
 
+void InfoBarView::AddViewToContentArea(views::View* view) {
+  child_container_->AddChildView(view);
+}
+
 // static
 void InfoBarView::AssignWidthsSorted(Labels* labels, int available_width) {
   if (labels->empty())
     return;
   gfx::Size back_label_size(labels->back()->GetPreferredSize());
   back_label_size.set_width(
       std::min(back_label_size.width(),
                available_width / static_cast<int>(labels->size())));
   labels->back()->SetSize(back_label_size);
   labels->pop_back();
@@ skipping 56 matching lines @@
 void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   views::ExternalFocusTracker::OnWillChangeFocus(focused_before, focused_now);
 
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }