Fix IPH menu button animation for non-unit scale factors

This is a workaround for a layer mask invalidation bug.

Bug: 909755, 935808
Change-Id: Ib634ab20b731bafc658487ddcaf4de98167cbe6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1487142
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637387}

chrome/browser/ui/views/toolbar/browser_app_menu_button.cc

@@ -74,10 +74,12 @@ constexpr float kFeaturePromoPulseInsetDip = 3.0f;
 class PulsingInkDropMask : public gfx::AnimationDelegate,
                            public views::InkDropMask {
  public:
-  PulsingInkDropMask(const gfx::Size& layer_size,
+  PulsingInkDropMask(views::View* layer_container,
+                     const gfx::Size& layer_size,
                      float normal_corner_radius,
                      float max_inset)
       : views::InkDropMask(layer_size),
+        layer_container_(layer_container),
         normal_corner_radius_(normal_corner_radius),
         max_inset_(max_inset),
         throb_animation_(this) {
@@ -109,8 +111,18 @@ class PulsingInkDropMask : public gfx::AnimationDelegate,
   void AnimationProgressed(const gfx::Animation* animation) override {
     DCHECK_EQ(animation, &throb_animation_);
     layer()->SchedulePaint(gfx::Rect(layer()->size()));
+
+    // This is a workaround for crbug.com/935808: for scale factors >1,
+    // invalidating the mask layer doesn't cause the whole layer to be repainted
+    // on screen. TODO(crbug.com/935808): remove this workaround once the bug is
+    // fixed.
+    layer_container_->SchedulePaint();
   }
 
+  // The View that contains the InkDrop layer we're masking. This must outlive
+  // our instance.
+  views::View* const layer_container_;
+
   // Normal corner radius of the ink drop without animation. This is also the
   // corner radius at the largest instant of the animation.
   const float normal_corner_radius_;
@@ -382,9 +394,9 @@ std::unique_ptr<views::InkDropMask> BrowserAppMenuButton::CreateInkDropMask()
 #if BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
   if (promo_feature_) {
     const float corner_radius = height() / 2.0f;
-    return std::make_unique<PulsingInkDropMask>(ink_drop_container()->size(),
-                                                corner_radius,
-                                                kFeaturePromoPulseInsetDip);
+    return std::make_unique<PulsingInkDropMask>(
+        ink_drop_container(), ink_drop_container()->size(), corner_radius,
+        kFeaturePromoPulseInsetDip);
   }
 #endif
 

ui/views/controls/button/label_button.h

@@ -191,7 +191,7 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
   // A separate view is necessary to hold the ink drop layer so that it can
   // be stacked below |image_| and on top of |label_|, without resorting to
   // drawing |label_| on a layer (which can mess with subpixel anti-aliasing).
-  InkDropContainerView* ink_drop_container_;
+  InkDropContainerView* const ink_drop_container_;
 
   // The cached font lists in the normal and default button style. The latter
   // may be bold.