Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: ui/views/controls/button/custom_button.cc

Issue 1494433003: Fixes a crash when InkDropDelegate gets destroyed after its InkDropHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes a crash when InkDropDelegate gets destroyed after its InkDropHost (comments) Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/ink_drop_delegate_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index bb4550098ee142bdc6194be9f87886aecb609036..6dd4d46521ab2f11e147fbd5ffe2a7dec4ec1d1c 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -56,6 +56,9 @@ CustomButton* CustomButton::AsCustomButton(views::View* view) {
}
CustomButton::~CustomButton() {
+ // InkDropDelegate needs to be destroyed by now since it may need to call
+ // methods on |this| via InkDropHost.
+ DCHECK(!ink_drop_delegate_);
sadrul 2015/12/07 18:04:17 It seems somewhat unfortunate to require the subcl
varkha 2015/12/07 21:35:29 Done.
}
void CustomButton::SetState(ButtonState state) {
« no previous file with comments | « ui/views/animation/ink_drop_delegate_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698