bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid possible reentrancy of ThemeChanged (see #3671)

Browse Source 
The call to SelectNativeTheme from ChromeBrowserFrame::Initialized was
causing Widget::ThemeChanged reentrancy via OnColorProviderCacheResetMissed
when running with `--enable-chrome-runtime --use-native`. Make all calls to
ThemeChanged async to avoid this and possible future issues.
This commit is contained in:
Marshall Greenblatt
2024-04-14 21:34:45 -04:00
parent 1482ffe749
commit e461d8f247
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libcef/browser/chrome/views/chrome_browser_frame.cc
View File

@@ -5,6 +5,7 @@
#include "libcef/browser/chrome/views/chrome_browser_frame.h"
#include "libcef/browser/chrome/chrome_browser_host_impl.h"
#include "libcef/browser/thread_util.h"
#include "libcef/browser/views/window_view.h"
#include "chrome/browser/themes/theme_service.h"
@@ -93,10 +94,7 @@ void ChromeBrowserFrame::UserChangedTheme(
// Calls ThemeChanged() and possibly SelectNativeTheme().
BrowserFrame::UserChangedTheme(theme_change_type);
if (window_view_) {
window_view_->OnThemeColorsChanged(/*chrome_theme=*/!native_theme_change_);
ThemeChanged();
}
NotifyThemeColorsChanged(/*chrome_theme=*/!native_theme_change_);
}
views::internal::RootView* ChromeBrowserFrame::CreateRootView() {
@@ -156,8 +154,15 @@ void ChromeBrowserFrame::OnColorProviderCacheResetMissed() {
return;
}
NotifyThemeColorsChanged(/*chrome_theme=*/false);
}
void ChromeBrowserFrame::NotifyThemeColorsChanged(bool chrome_theme) {
if (window_view_) {
window_view_->OnThemeColorsChanged(/*chrome_theme=*/false);
ThemeChanged();
window_view_->OnThemeColorsChanged(chrome_theme);
// Call ThemeChanged() asynchronously to avoid possible reentrancy.
CEF_POST_TASK(TID_UI, base::BindOnce(&ChromeBrowserFrame::ThemeChanged,
weak_ptr_factory_.GetWeakPtr()));
}
}