[Views] Update ink drop for omnibox icons

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index 1647164adff4ee34c15ab1f34ea9688652b53676..23211ffb9b7eca916ef6632657121dcc8b70376b 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -8,11 +8,17 @@
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/compositor/layer_animator.h"
+#include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
+#include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/animation/ink_drop_mask.h"
+#include "ui/views/animation/ink_drop_ripple.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/widget.h"
@@ -22,12 +28,78 @@ namespace {
 // Amount of space on either side of the separator that appears after the label.
 constexpr int kSpaceBesideSeparator = 8;
 
+// Radius of the ink drop mask's rounded rectangle shape.
+constexpr int kInkDropMaskRadius = 2;
+
+// The length of the separator's fade animation.
+constexpr int kFadeInDurationMs = 250;
+constexpr int kFadeOutDurationMs = 175;
+
 }  // namespace
 
+//////////////////////////////////////////////////////////////////
+// SeparatorView class
+
+IconLabelBubbleView::SeparatorView::SeparatorView(IconLabelBubbleView* owner) {
+  DCHECK(owner);
+  owner_ = owner;
+  SetPaintToLayer();
+  layer()->SetFillsBoundsOpaquely(false);
+}
+
+void IconLabelBubbleView::SeparatorView::OnPaint(gfx::Canvas* canvas) {
+  if (!owner_->ShouldShowLabel())
+    return;
+
+  const SkColor plain_text_color = owner_->GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultColor);
+  const SkColor separator_color = SkColorSetA(
+      plain_text_color, color_utils::IsDark(plain_text_color) ? 0x59 : 0xCC);
+
+  gfx::Rect bounds(owner_->label()->bounds());
+  const int kSeparatorHeight = 16;
+  bounds.Inset(0, (bounds.height() - kSeparatorHeight) / 2);
+  bounds.set_width(bounds.width() + kSpaceBesideSeparator);
+  canvas->Draw1pxLine(gfx::PointF(bounds.top_right()),
+                      gfx::PointF(bounds.bottom_right()), separator_color);
+}
+
+bool IconLabelBubbleView::SeparatorView::CanProcessEventsWithinSubtree() const {
+  return false;
+}
+
+void IconLabelBubbleView::SeparatorView::UpdateOpacity() {
+  views::InkDrop* ink_drop = owner_->GetInkDrop();
+  DCHECK(ink_drop);
+
+  // If an inkdrop highlight or ripple is animating in or visible, the
+  // separator should fade out.
+  views::InkDropState state = ink_drop->GetTargetInkDropState();
+  float opacity = 0.0f;
+  float duration = kFadeOutDurationMs;
+  if (!ink_drop->IsHighlightFadingInOrVisible() &&
+      (state == views::InkDropState::HIDDEN ||
+       state == views::InkDropState::DEACTIVATED)) {

[bruthig, 2017/03/22 17:20:16]

You may want to include ACTION_TRIGGERED. It auto-transitions to HIDDEN as
similar to DEACTIVATED.

[spqchan, 2017/03/24 17:58:03]

Done.

+    opacity = 1.0f;
+    duration = kFadeInDurationMs;
+  }
+
+  ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());
+  animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(duration));
+  animation.SetTweenType(gfx::Tween::Type::EASE_IN);
+  layer()->SetOpacity(opacity);
+}
+
+//////////////////////////////////////////////////////////////////
+// IconLabelBubbleView class
+
 IconLabelBubbleView::IconLabelBubbleView(const gfx::FontList& font_list,
                                          bool elide_in_middle)
-    : image_(new views::ImageView()),
-      label_(new views::Label(base::string16(), {font_list})) {
+    : CustomButton(this),
+      image_(new views::ImageView()),
+      label_(new views::Label(base::string16(), {font_list})),
+      ink_drop_container_(new views::InkDropContainerView()),
+      suppress_button_action_(false) {
   // Disable separate hit testing for |image_|.  This prevents views treating
   // |image_| as a separate mouse hover region from |this|.
   image_->set_can_process_events_within_subtree(false);
@@ -41,6 +113,12 @@ IconLabelBubbleView::IconLabelBubbleView(const gfx::FontList& font_list,
     label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   AddChildView(label_);
 
+  separator_view_.reset(new SeparatorView(this));
+  AddChildView(separator_view_.get());
+
+  AddChildView(ink_drop_container_);
+  ink_drop_container_->SetVisible(false);
+
   // Bubbles are given the full internal height of the location bar so that all
   // child views in the location bar have the same height. The visible height of
   // the bubble should be smaller, so use an empty border to shrink down the
@@ -55,6 +133,16 @@ IconLabelBubbleView::IconLabelBubbleView(const gfx::FontList& font_list,
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
+void IconLabelBubbleView::ButtonPressed(Button* sender,
+                                        const ui::Event& event) {
+  if (!suppress_button_action_)
+    OnActivate(event);
+}
+
+void IconLabelBubbleView::InkDropAnimationStarted() {
+  separator_view_->UpdateOpacity();
+}
+
 void IconLabelBubbleView::SetLabel(const base::string16& label) {
   label_->SetText(label);
 }
@@ -79,6 +167,10 @@ bool IconLabelBubbleView::OnActivate(const ui::Event& event) {
   return false;
 }
 
+bool IconLabelBubbleView::IsBubbleShown() const {
+  return false;
+}
+
 gfx::Size IconLabelBubbleView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label_->GetPreferredSize().width());
@@ -120,6 +212,20 @@ void IconLabelBubbleView::Layout() {
   const int label_width = std::max(
       0, width() - label_x - bubble_trailing_padding - kSpaceBesideSeparator);
   label_->SetBounds(label_x, 0, label_width, height());
+  separator_view_->SetBoundsRect(GetLocalBounds());
+  ink_drop_container_->SetBoundsRect(GetLocalBounds());
+}
+
+void IconLabelBubbleView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
+  if (ink_drop_mask_)
+    ink_drop_mask_->UpdateLayerSize(size());
+
+  InkDropHostView::OnBoundsChanged(previous_bounds);
+}
+
+bool IconLabelBubbleView::OnMousePressed(const ui::MouseEvent& event) {
+  suppress_button_action_ = IsBubbleShown();
+  return CustomButton::OnMousePressed(event);

[bruthig, 2017/03/24 20:48:02]

Can you confirm that this isn't going to cause an ACTION_PENDING animation when
|suppress_button_action_| is true?  I think it will and I don't think that's
what we want here?

The best way would be with a test ;)

 }
 
 void IconLabelBubbleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
@@ -134,25 +240,87 @@ void IconLabelBubbleView::OnNativeThemeChanged(
 }
 
 void IconLabelBubbleView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
-  image()->SetPaintToLayer();
-  image()->layer()->SetFillsBoundsOpaquely(false);
-  InkDropHostView::AddInkDropLayer(ink_drop_layer);
+  ink_drop_mask_ = CreateInkDropMask();
+  if (ink_drop_mask_)
+    ink_drop_layer->SetMaskLayer(ink_drop_mask_->layer());
+  ink_drop_container_->AddInkDropLayer(ink_drop_layer);
 }
 
 void IconLabelBubbleView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
-  InkDropHostView::RemoveInkDropLayer(ink_drop_layer);
-  image()->DestroyLayer();
+  ink_drop_container_->RemoveInkDropLayer(ink_drop_layer);
+  ink_drop_mask_.reset();
+}
+
+std::unique_ptr<views::InkDrop> IconLabelBubbleView::CreateInkDrop() {
+  std::unique_ptr<views::InkDropImpl> ink_drop =
+      CreateDefaultFloodFillInkDropImpl();
+  ink_drop->SetShowHighlightOnFocus(true);
+  ink_drop->SetObserver(this);
+  return std::move(ink_drop);
 }
 
 std::unique_ptr<views::InkDropHighlight>
 IconLabelBubbleView::CreateInkDropHighlight() const {
-  // Only show a highlight effect when the label is empty/invisible.
-  return label()->visible() ? nullptr
-                            : InkDropHostView::CreateInkDropHighlight();
+  gfx::PointF ink_drop_center = gfx::RectF(GetLocalBounds()).CenterPoint();
+  gfx::Size ink_drop_size = size();
+  if (ShouldShowLabel()) {

[bruthig, 2017/03/22 17:20:16]

Would it be easier to position the |ink_drop_container_| based on
ShouldShowLabel() and then the ripple and highlight could be positioned relative
to the container? i.e. the ripple/highlight could just be centered in the
container.

The ripple and highlight really should be positioned relative to the
|ink_drop_container_|'s coordinates anyway.  They just currently happen to be
the same as |this|'s coordinates.

[spqchan, 2017/03/24 17:58:03]

Done.

+    int padding_offset = -GetPostSeparatorPadding();
+    ink_drop_center.Offset(padding_offset / 2, 0);
+    ink_drop_size.Enlarge(padding_offset, 0);
+  }
+
+  return InkDropHostView::CreateDefaultInkDropHighlight(ink_drop_center,
+                                                        ink_drop_size);
+}
+
+std::unique_ptr<views::InkDropRipple> IconLabelBubbleView::CreateInkDropRipple()
+    const {
+  gfx::Point ink_drop_center = GetLocalBounds().CenterPoint();
+  gfx::Size ink_drop_size = size();
+  if (ink_drop_size.IsEmpty())
+    return CreateDefaultInkDropRipple(ink_drop_center);
+
+  if (ShouldShowLabel()) {
+    int padding_offset = -GetPostSeparatorPadding();
+    ink_drop_center.Offset(padding_offset / 2, 0);
+    ink_drop_size.Enlarge(padding_offset, 0);
+  }
+
+  return base::MakeUnique<views::FloodFillInkDropRipple>(
+      ink_drop_size, ink_drop_center, GetInkDropBaseColor(),
+      ink_drop_visible_opacity());
+}
+
+std::unique_ptr<views::InkDropMask> IconLabelBubbleView::CreateInkDropMask()
+    const {
+  return base::MakeUnique<views::RoundRectInkDropMask>(size(), gfx::Insets(),
+                                                       kInkDropMaskRadius);
 }
 
 SkColor IconLabelBubbleView::GetInkDropBaseColor() const {
-  return color_utils::DeriveDefaultIconColor(GetTextColor());
+  return color_utils::DeriveDefaultIconColor(GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_TextfieldDefaultColor));
+}
+
+bool IconLabelBubbleView::IsTriggerableEvent(const ui::Event& event) {
+  return !IsBubbleShown();
+}
+
+void IconLabelBubbleView::OnClickCanceled(const ui::Event& event) {
+  // Overriden to prevent CustomButton from hiding the ink drop when the click
+  // is cancelled. The click might be cancelled because the bubble is still
+  // opened. In this case, the ink drop state should still be active.
+}
+
+void IconLabelBubbleView::OnWidgetDestroying(views::Widget* widget) {
+  widget->RemoveObserver(this);
+}
+
+void IconLabelBubbleView::OnWidgetVisibilityChanged(views::Widget* widget,
+                                                    bool visible) {
+  // |widget| is a bubble that has just got shown / hidden.
+  if (!visible)
+    AnimateInkDrop(views::InkDropState::HIDDEN, nullptr /* event */);
 }
 
 SkColor IconLabelBubbleView::GetParentBackgroundColor() const {
@@ -216,20 +384,3 @@ float IconLabelBubbleView::GetScaleFactor() const {
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
-
-void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
-  if (!ShouldShowLabel())
-    return;
-
-  const SkColor plain_text_color = GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_TextfieldDefaultColor);
-  const SkColor separator_color = SkColorSetA(
-      plain_text_color, color_utils::IsDark(plain_text_color) ? 0x59 : 0xCC);
-
-  gfx::Rect bounds(label_->bounds());
-  const int kSeparatorHeight = 16;
-  bounds.Inset(0, (bounds.height() - kSeparatorHeight) / 2);
-  bounds.set_width(bounds.width() + kSpaceBesideSeparator);
-  canvas->Draw1pxLine(gfx::PointF(bounds.top_right()),
-                      gfx::PointF(bounds.bottom_right()), separator_color);
-}