views: disable ink drops altogether on Mac

ui/views/animation/ink_drop_host_view.cc

 // Copyright 2016 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/animation/ink_drop_host_view.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/events/event.h"
 #include "ui/events/scoped_target_handler.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/views/animation/ink_drop.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_stub.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
+#include "ui/views/style/platform_style.h"
 
 namespace views {
 namespace {
 
 // The scale factor to compute the large size of the default
 // SquareInkDropRipple.
 const float kLargeInkDropScale = 1.333f;
 
 // Default opacity of the ink drop when it is visible.
 const float kInkDropVisibleOpacity = 0.175f;
@@ skipping 167 matching lines @@
 }
 
 gfx::Point InkDropHostView::GetInkDropCenterBasedOnLastEvent() const {
   return last_ripple_triggering_event_
              ? last_ripple_triggering_event_->location()
              : GetLocalBounds().CenterPoint();
 }
 
 void InkDropHostView::AnimateInkDrop(InkDropState state,
                                      const ui::LocatedEvent* event) {
+  // On Mac, ink drops are never used: https://crbug.com/701888
+  if (!PlatformStyle::kUseRipples)
+    return;
+
 #if defined(OS_WIN)
   // On Windows, don't initiate ink-drops for touch/gesture events.
   // Additionally, certain event states should dismiss existing ink-drop
   // animations. If the state is already other than HIDDEN, presumably from
   // a mouse or keyboard event, then the state should be allowed. Conversely,
   // if the requested state is ACTIVATED, then it should always be allowed.
   if (event && (event->IsTouchEvent() || event->IsGestureEvent()) &&
       GetInkDrop()->GetTargetInkDropState() == InkDropState::HIDDEN &&
       state != InkDropState::ACTIVATED)
     return;
@@ skipping 50 matching lines @@
   return gfx::kPlaceholderColor;
 }
 
 std::unique_ptr<views::InkDropMask> InkDropHostView::CreateInkDropMask() const {
   return nullptr;
 }
 
 InkDrop* InkDropHostView::GetInkDrop() {
   if (!ink_drop_) {
     if (ink_drop_mode_ == InkDropMode::OFF)
       ink_drop_ = base::MakeUnique<InkDropStub>();

[bruthig, 2017/04/21 20:30:08]

I think it would be better if you returned an InkDropStub from here when you are
on Mac.  This will suppress the InkDropHighlights for mouse hover and keyboard
focus as well.

     else
       ink_drop_ = CreateInkDrop();
   }
   return ink_drop_.get();
 }
 
 std::unique_ptr<InkDropImpl> InkDropHostView::CreateDefaultInkDropImpl() {
   std::unique_ptr<InkDropImpl> ink_drop =
       base::MakeUnique<InkDropImpl>(this, size());
   ink_drop->SetAutoHighlightMode(
       views::InkDropImpl::AutoHighlightMode::HIDE_ON_RIPPLE);
   return ink_drop;
 }
 
 std::unique_ptr<InkDropImpl>
 InkDropHostView::CreateDefaultFloodFillInkDropImpl() {
   std::unique_ptr<views::InkDropImpl> ink_drop =
       InkDropHostView::CreateDefaultInkDropImpl();
   ink_drop->SetAutoHighlightMode(
       views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
   return ink_drop;
 }
 
 }  // namespace views