Add ink drop masking to TrayBackgroundView

ash/common/system/tray/tray_background_view.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 "ash/common/system/tray/tray_background_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
@@ skipping 17 matching lines @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/nine_image_painter.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.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_mask.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace {
 
 const int kAnimationDurationForPopupMs = 200;
 
 // Duration of opacity animation for visibility changes.
 const int kAnimationDurationForVisibilityMs = 250;
@@ skipping 321 matching lines @@
   node_data->SetName(GetAccessibleNameForTray());
 }
 
 void TrayBackgroundView::AboutToRequestFocusFromTabTraversal(bool reverse) {
   // Return focus to the login view. See crbug.com/120500.
   views::View* v = GetNextFocusableView();
   if (v)
     v->AboutToRequestFocusFromTabTraversal(reverse);
 }
 
+void TrayBackgroundView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
+  gfx::Rect local_bounds = GetLocalBounds();
+  ink_drop_layer->SetBounds(local_bounds);

[bruthig, 2016/11/11 20:16:43]

Capturing offline discussion:
Let's move the ownership of setting the bounds on the ink drop root layer into
the InkDropImpl. This will reduce the burden on AddInkDropLayer() overrides to
do the right thing.

We will have to add an InkDrop::BoundsUpdated() method so the host view can
notify the ink drop instance of the new bounds/size.

[mohsen, 2016/11/13 23:31:28]

Done.

+  ink_drop_mask_.reset(new views::RoundRectInkDropMask(
+      local_bounds, GetBackgroundBounds(GetContentsBounds(), shelf_alignment_),
+      kTrayRoundedBorderRadius));
+  ink_drop_layer->SetMaskLayer(ink_drop_mask_->layer());
+  ActionableView::AddInkDropLayer(ink_drop_layer);
+}
+
+void TrayBackgroundView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
+  ActionableView::RemoveInkDropLayer(ink_drop_layer);
+  ink_drop_layer->SetMaskLayer(nullptr);
+  ink_drop_mask_.reset();
+}
+
 std::unique_ptr<views::InkDropRipple> TrayBackgroundView::CreateInkDropRipple()
     const {
   return base::MakeUnique<views::FloodFillInkDropRipple>(
       GetBackgroundBounds(GetContentsBounds(), shelf_alignment_),
       GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(),
       ink_drop_visible_opacity());
 }
 
 std::unique_ptr<views::InkDropHighlight>
 TrayBackgroundView::CreateInkDropHighlight() const {
@@ skipping 230 matching lines @@
   paint.setAntiAlias(true);
 
   const gfx::Rect bounds = horizontal_shelf ? gfx::Rect(x, y, width, height)
                                             : gfx::Rect(y, x, height, width);
   gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));
   canvas->DrawLine(horizontal_shelf ? rect.top_right() : rect.bottom_left(),
                    rect.bottom_right(), paint);
 }
 
 }  // namespace ash