summaryrefslogtreecommitdiff
path: root/www-client/chromium/files/chromium-111-InkDropHost-crash.patch
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2023-02-02 10:05:54 -0500
committerGravatar Chris Xiong <chirs241097@gmail.com> 2023-02-02 10:05:54 -0500
commitc2f54423db73e8f125db21032095489027324ffb (patch)
tree1ab0fc9f2ca21e8adb7780dabdd860816f47a379 /www-client/chromium/files/chromium-111-InkDropHost-crash.patch
parent257f82bd695dc2a7543b527d698c206d8ef397d2 (diff)
downloadppo-c2f54423db73e8f125db21032095489027324ffb.tar.xz
chromium 111.0.5562.0
Diffstat (limited to 'www-client/chromium/files/chromium-111-InkDropHost-crash.patch')
-rw-r--r--www-client/chromium/files/chromium-111-InkDropHost-crash.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-111-InkDropHost-crash.patch b/www-client/chromium/files/chromium-111-InkDropHost-crash.patch
new file mode 100644
index 0000000..f4a1fc4
--- /dev/null
+++ b/www-client/chromium/files/chromium-111-InkDropHost-crash.patch
@@ -0,0 +1,25 @@
+diff --git a/ui/views/animation/ink_drop_host.h b/ui/views/animation/ink_drop_host.h
+index bd0975b..e5df288 100644
+--- a/ui/views/animation/ink_drop_host.h
++++ b/ui/views/animation/ink_drop_host.h
+@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
+ // Used to observe View and inform the InkDrop of host-transform changes.
+ ViewLayerTransformObserver host_view_transform_observer_;
+
++ // Declared before |ink_drop_|, because InkDropImpl may call
++ // RemoveInkDropLayer on partly destructed InkDropHost. In
++ // that case |ink_drop_mask_| must be still valid.
++ std::unique_ptr<views::InkDropMask> ink_drop_mask_;
++
+ // Should not be accessed directly. Use GetInkDrop() instead.
+ std::unique_ptr<InkDrop> ink_drop_;
+
+@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
+ int ink_drop_small_corner_radius_ = 2;
+ int ink_drop_large_corner_radius_ = 4;
+
+- std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+-
+ base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
+ base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
+ create_ink_drop_ripple_callback_;