Fix a crash due to reentrancy in the widget while processing a theme changed notification after com…

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 156 matching lines @@
       focus_on_creation_(true),
       is_top_level_(false),
       native_widget_initialized_(false),
       native_widget_destroyed_(false),
       is_mouse_button_pressed_(false),
       ignore_capture_loss_(false),
       last_mouse_event_was_move_(false),
       auto_release_capture_(true),
       views_with_layers_dirty_(false),
       movement_disabled_(false),
-      observer_manager_(this) {}
+      observer_manager_(this),
+      processing_theme_changed_(false) {}
 
 Widget::~Widget() {
   DestroyRootView();
   if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) {
     delete native_widget_;
   } else {
     DCHECK(native_widget_destroyed_)
         << "Destroying a widget with a live native widget. "
         << "Widget probably should use WIDGET_OWNS_NATIVE_WIDGET ownership.";
   }
@@ skipping 703 matching lines @@
     frame_type_ = ShouldUseNativeFrame() ? FRAME_TYPE_FORCE_CUSTOM :
         FRAME_TYPE_FORCE_NATIVE;
   } else {
     frame_type_ = frame_type_ == FRAME_TYPE_FORCE_CUSTOM ?
         FRAME_TYPE_FORCE_NATIVE : FRAME_TYPE_FORCE_CUSTOM;
   }
   FrameTypeChanged();
 }
 
 void Widget::FrameTypeChanged() {
+  if (processing_theme_changed_)
+    return;
   native_widget_->FrameTypeChanged();
 }
 
 const ui::Compositor* Widget::GetCompositor() const {
   return native_widget_->GetCompositor();
 }
 
 const ui::Layer* Widget::GetLayer() const {
   return native_widget_->GetLayer();
 }
@@ skipping 483 matching lines @@
 
 void Widget::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
   DCHECK(observer_manager_.IsObserving(observed_theme));
 
   ui::NativeTheme* current_native_theme = GetNativeTheme();
   if (!observer_manager_.IsObserving(current_native_theme)) {
     observer_manager_.RemoveAll();
     observer_manager_.Add(current_native_theme);
   }
 
+  DCHECK_EQ(processing_theme_changed_, false);
+  processing_theme_changed_ = true;

[sky, 2017/02/17 22:50:03]

Use AutoReset.

[ananta, 2017/02/17 22:55:04]

Done.

   root_view_->PropagateNativeThemeChanged(current_native_theme);
+  processing_theme_changed_ = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, protected:
 
 internal::RootView* Widget::CreateRootView() {
   return new internal::RootView(this);
 }
 
 void Widget::DestroyRootView() {
@@ skipping 129 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views