| 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 f5a7df26a74b78e2ebe6329e9b389e7cf915c5ba..0db2c96adcfca0d776130d90bfd1817fa3c4ba77 100644
|
| --- a/ui/views/animation/ink_drop_host_view.cc
|
| +++ b/ui/views/animation/ink_drop_host_view.cc
|
| @@ -5,6 +5,7 @@
|
| #include "ui/views/animation/ink_drop_host_view.h"
|
|
|
| #include "base/memory/ptr_util.h"
|
| +#include "ui/compositor/layer_type.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/scoped_target_handler.h"
|
| #include "ui/gfx/color_palette.h"
|
| @@ -130,7 +131,7 @@ InkDropHostView::~InkDropHostView() {
|
|
|
| void InkDropHostView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
|
| old_paint_to_layer_ = layer() != nullptr;
|
| - SetPaintToLayer(true);
|
| + SetPaintToLayer(ui::LAYER_TEXTURED);
|
| layer()->SetFillsBoundsOpaquely(false);
|
| ink_drop_mask_ = CreateInkDropMask();
|
| if (ink_drop_mask_)
|
| @@ -148,7 +149,8 @@ void InkDropHostView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
|
| layer()->Remove(ink_drop_layer);
|
| // Layers safely handle destroying a mask layer before the masked layer.
|
| ink_drop_mask_.reset();
|
| - SetPaintToLayer(old_paint_to_layer_);
|
| + SetPaintToLayer(old_paint_to_layer_ ? ui::LAYER_TEXTURED
|
| + : ui::LAYER_NOT_DRAWN);
|
| }
|
|
|
| std::unique_ptr<InkDrop> InkDropHostView::CreateInkDrop() {
|
|
|