25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
|
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
|
||
|
|
--- chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash 2021-10-05 16:04:46.313586509 -0400
|
||
|
|
+++ chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h 2021-10-05 16:05:12.213732558 -0400
|
||
|
|
@@ -228,6 +228,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_;
|
||
|
|
|
||
|
|
@@ -249,8 +254,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_;
|