Centered flood fill style ink drop ripples on mouse/touch points.

chrome/browser/ui/views/download/download_item_view_md.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/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 143 matching lines @@
 
 // Allows the DownloadItemViewMd to control the InkDrop on the drop down button.
 class DownloadItemViewMd::DropDownButton : public BarControlButton {
  public:
   explicit DropDownButton(views::ButtonListener* listener)
       : BarControlButton(listener) {}
   ~DropDownButton() override {}
 
   // Promoted visibility to public.
   void AnimateInkDrop(views::InkDropState state) {
-    BarControlButton::AnimateInkDrop(state);
+    // TODO(bruthig): Plumb in the proper Event.
+    BarControlButton::AnimateInkDrop(state, nullptr /* event */);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DropDownButton);
 };
 
 DownloadItemViewMd::DownloadItemViewMd(DownloadItem* download_item,
                                        DownloadShelfView* parent)
     : shelf_(parent),
       status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
@@ skipping 227 matching lines @@
 
 // Handle drag (file copy) operations.
 bool DownloadItemViewMd::OnMouseDragged(const ui::MouseEvent& event) {
   // Mouse should not activate us in dangerous mode.
   if (IsShowingWarningDialog())
     return true;
 
   if (!starting_drag_) {
     starting_drag_ = true;
     drag_start_point_ = event.location();
-    AnimateInkDrop(views::InkDropState::HIDDEN);
+    AnimateInkDrop(views::InkDropState::HIDDEN, &event);
   }
   if (dragging_) {
     if (download()->GetState() == DownloadItem::COMPLETE) {
       IconManager* im = g_browser_process->icon_manager();
       gfx::Image* icon = im->LookupIconFromFilepath(
           download()->GetTargetFilePath(), IconLoader::SMALL);
       views::Widget* widget = GetWidget();
       DragDownloadItem(download(), icon,
                        widget ? widget->GetNativeView() : NULL);
     }
@@ skipping 20 matching lines @@
 }
 
 bool DownloadItemViewMd::OnKeyPressed(const ui::KeyEvent& event) {
   // Key press should not activate us in dangerous mode.
   if (IsShowingWarningDialog())
     return true;
 
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     // OpenDownload may delete this, so don't add any code after this line.
-    OpenDownload();
+    OpenDownload(event);
     return true;
   }
   return false;
 }
 
 bool DownloadItemViewMd::GetTooltipText(const gfx::Point& p,
                                         base::string16* tooltip) const {
   if (IsShowingWarningDialog()) {
     tooltip->clear();
     return false;
@@ skipping 21 matching lines @@
 void DownloadItemViewMd::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   InkDropHostView::AddInkDropLayer(ink_drop_layer);
   // The layer that's added to host the ink drop layer must mask to bounds
   // so the hover effect is clipped while animating open.
   layer()->SetMasksToBounds(true);
 }
 
 std::unique_ptr<views::InkDropRipple> DownloadItemViewMd::CreateInkDropRipple()
     const {
   return base::WrapUnique(new views::FloodFillInkDropRipple(
-      GetLocalBounds(), GetLocalBounds().CenterPoint(),
+      GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
       color_utils::DeriveDefaultIconColor(GetTextColor())));
 }
 
 std::unique_ptr<views::InkDropHighlight>
 DownloadItemViewMd::CreateInkDropHighlight() const {
   if (IsShowingWarningDialog())
     return nullptr;
 
   gfx::Size size = GetPreferredSize();
   return base::WrapUnique(new views::InkDropHighlight(
@@ skipping 234 matching lines @@
   // We render differently when focused.
   SchedulePaint();
 }
 
 void DownloadItemViewMd::OnBlur() {
   View::OnBlur();
   // We render differently when focused.
   SchedulePaint();
 }
 
-void DownloadItemViewMd::OpenDownload() {
+void DownloadItemViewMd::OpenDownload(const ui::Event& event) {
   DCHECK(!IsShowingWarningDialog());
   // We're interested in how long it takes users to open downloads.  If they
   // open downloads super quickly, we should be concerned about clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
 
   UpdateAccessibleName();
-  AnimateInkDrop(views::InkDropState::ACTION_TRIGGERED);
+  AnimateInkDrop(views::InkDropState::ACTION_TRIGGERED, &event);

[Evan Stade, 2016/06/14 21:13:24]

I'd just as soon move this out to the two OpenDownload callsites.

[bruthig, 2016/06/14 21:57:01]

Done.

 
   // Calling download()->OpenDownload may delete this, so this must be
   // the last thing we do.
   download()->OpenDownload();
 }
 
 bool DownloadItemViewMd::SubmitDownloadToFeedbackService() {
 #if defined(FULL_SAFE_BROWSING)
   safe_browsing::SafeBrowsingService* sb_service =
       g_browser_process->safe_browsing_service();
@@ skipping 79 matching lines @@
     return;
 
   // Stop any completion animation.
   if (complete_animation_.get() && complete_animation_->is_animating())
     complete_animation_->End();
 
   // Don't show the ripple for right clicks.
   if (!active_event)
     return;
 
-  AnimateInkDrop(views::InkDropState::ACTION_PENDING);
+  AnimateInkDrop(views::InkDropState::ACTION_PENDING, &event);
 }
 
 void DownloadItemViewMd::HandleClickEvent(const ui::LocatedEvent& event,
                                           bool active_event) {
   // Mouse should not activate us in dangerous mode.
   if (mode_ == DANGEROUS_MODE)
     return;
 
   if (!active_event || IsShowingWarningDialog())
     return;
 
   // OpenDownload may delete this, so don't add any code after this line.
-  OpenDownload();
+  OpenDownload(event);
 }
 
 void DownloadItemViewMd::SetDropdownState(State new_state) {
   // Avoid extra SchedulePaint()s if the state is going to be the same and
   // |dropdown_button_| has already been initialized.
   if (dropdown_state_ == new_state &&
       !dropdown_button_->GetImage(views::CustomButton::STATE_NORMAL).isNull())
     return;
 
   dropdown_button_->SetIcon(
@@ skipping 248 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }