| Index: ui/views/animation/ink_drop_host_view.cc
|
| diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
|
| index 5cdaedba6c9c7737aa1ffcf71cddc474326a5dcf..f204e80b9d6cac022a25a1a6f7825eb2c0f1e810 100644
|
| --- a/ui/views/animation/ink_drop_host_view.cc
|
| +++ b/ui/views/animation/ink_drop_host_view.cc
|
| @@ -15,6 +15,7 @@
|
| #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 {
|
| @@ -202,6 +203,10 @@ gfx::Point InkDropHostView::GetInkDropCenterBasedOnLastEvent() const {
|
|
|
| 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
|
|
|