commit f6b23b582e63589f0cc9b121ab10b5d4c01cb7cb
author Alex Newcomer <newcomer@chromium.org> Thu Nov 04 00:44:32 2021
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Nov 04 00:44:32 2021
tree 73f4e09801e7f77d7ad08689a24dadc63b834d47
parent c4780653d5073047aa7ef90d837b0dac278cf6b0

Use WeakPtr to prevent using the ptr out of scope

When switching to AnimationBuilder, we passed
a callback instead of using the old
ImplicitAnimationObserver pattern.
ImplicitAnimationObserver removes itself on its
dtor. Meanwhile AnimationBuilder has a dangling
ptr.

Using a WeakPtr should fix this crash (but I
cannot repro it, so this fix is technically
speculative).

Bug: 1265741
Change-Id: I234621cfd780c93b47c1a11aa67945075f2e9632
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3260120
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#938078}

ui/views/animation/slide_out_controller.cc

diff --git a/ui/views/animation/slide_out_controller.cc b/ui/views/animation/slide_out_controller.cc
index 0d941907..11d5d390 100644
--- a/ui/views/animation/slide_out_controller.cc
+++ b/ui/views/animation/slide_out_controller.cc
@@ -186,7 +186,7 @@
     // after the animation finishes.
     AnimationBuilder()
         .OnEnded(base::BindOnce(&SlideOutController::OnAnimationsCompleted,
-                                base::Unretained(this)))
+                                weak_ptr_factory_.GetWeakPtr()))
         .Once()
         .SetDuration(animation_duration)
         .SetTransform(layer, transform, kSwipeTweenType);