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

Unified Diff: ui/views/cocoa/bridged_native_widget.mm

Issue 2577593002: MacViews: Be robust against Views manipulating Layers during Widget::Close(). (Closed)
Patch Set: selfnits Created 4 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 | « no previous file | ui/views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/bridged_native_widget.mm
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index b787dbc9549e986fd395cc5c8355a1408a58f427..da2361c07492b0fee524db6a1fb4ed1f5383a728 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -1046,6 +1046,11 @@ void BridgedNativeWidget::ClearAssociationForView(const views::View* view) {
}
void BridgedNativeWidget::ReorderChildViews() {
+ // Ignore layer manipulation during a Close(). This can be reached during the
+ // orderOut: in Close(), which notifies visibility changes to Views.
+ if (!bridged_view_)
+ return;
+
RankMap rank;
Widget* widget = native_widget_mac_->GetWidget();
RankNSViews(widget->GetRootView(), associated_views_, &rank);
« no previous file with comments | « no previous file | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698