File chromium-93-InkDropHost-crash.patch of Package chromium-ffmpeg-extra (Revision 4407c879c2f3d7778ebd138b74f5810a)

Currently displaying revision 4407c879c2f3d7778ebd138b74f5810a , Show latest

25
 
1
diff -up chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h
2
--- chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash 2021-10-05 16:04:46.313586509 -0400
3
+++ chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h   2021-10-05 16:05:12.213732558 -0400
4
@@ -228,6 +228,11 @@ class VIEWS_EXPORT InkDropHost {
5
   // Used to observe View and inform the InkDrop of host-transform changes.
6
   ViewLayerTransformObserver host_view_transform_observer_;
7
 
8
+  // Declared before |ink_drop_|, because InkDropImpl may call
9
+  // RemoveInkDropLayer on partly destructed InkDropHost. In
10
+  // that case |ink_drop_mask_| must be still valid.
11
+  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
12
+
13
   // Should not be accessed directly. Use GetInkDrop() instead.
14
   std::unique_ptr<InkDrop> ink_drop_;
15
 
16
@@ -249,8 +254,6 @@ class VIEWS_EXPORT InkDropHost {
17
   int ink_drop_small_corner_radius_ = 2;
18
   int ink_drop_large_corner_radius_ = 4;
19
 
20
-  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
21
-
22
   base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
23
   base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
24
       create_ink_drop_ripple_callback_;
25