bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chrome: cefclient: Fix crash on launch with --enable-chrome-runtime

This commit is contained in:
Marshall Greenblatt 2022-08-09 15:42:18 -04:00
parent ecb29b7fa5
commit 7ce139bd2c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
patch/patches/chrome_runtime_views.patch
View File

@ -45,7 +45,7 @@ index 20fcf6172c577..d34843570fa35 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const { bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index f3cc4af3bdae4..442eb363709d2 100644 index f3cc4af3bdae4..38c088087eb1f 100644
--- chrome/browser/ui/views/frame/browser_frame.cc --- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) { @@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@ -87,7 +87,16 @@ index f3cc4af3bdae4..442eb363709d2 100644
return browser_frame_view_->GetTopInset(false); return browser_frame_view_->GetTopInset(false);
} }
@@ -183,20 +197,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const { @@ -170,6 +184,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
}
bool BrowserFrame::UseCustomFrame() const {
+ if (!native_browser_frame_)
+ return true;
return native_browser_frame_->UseCustomFrame();
}
@@ -183,20 +199,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds, void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
ui::WindowShowState* show_state) const { ui::WindowShowState* show_state) const {
@ -118,7 +127,7 @@ index f3cc4af3bdae4..442eb363709d2 100644
browser_frame_view_->OnBrowserViewInitViewsComplete(); browser_frame_view_->OnBrowserViewInitViewsComplete();
} }
@@ -257,6 +281,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const { @@ -257,6 +283,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
ui::ColorProviderManager::ThemeInitializerSupplier* ui::ColorProviderManager::ThemeInitializerSupplier*
BrowserFrame::GetCustomTheme() const { BrowserFrame::GetCustomTheme() const {
@ -127,7 +136,7 @@ index f3cc4af3bdae4..442eb363709d2 100644
Browser* browser = browser_view_->browser(); Browser* browser = browser_view_->browser();
// If this is an incognito profile, there should never be a custom theme. // If this is an incognito profile, there should never be a custom theme.
if (browser->profile()->IsIncognitoProfile()) if (browser->profile()->IsIncognitoProfile())
@@ -274,6 +300,8 @@ BrowserFrame::GetCustomTheme() const { @@ -274,6 +302,8 @@ BrowserFrame::GetCustomTheme() const {
} }
void BrowserFrame::OnNativeWidgetWorkspaceChanged() { void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@ -136,7 +145,7 @@ index f3cc4af3bdae4..442eb363709d2 100644
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces()); IsVisibleOnAllWorkspaces());
@@ -363,6 +391,8 @@ void BrowserFrame::SetTabDragKind(TabDragKind tab_drag_kind) { @@ -363,6 +393,8 @@ void BrowserFrame::SetTabDragKind(TabDragKind tab_drag_kind) {
ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const { ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const {
auto key = Widget::GetColorProviderKey(); auto key = Widget::GetColorProviderKey();
@ -145,7 +154,7 @@ index f3cc4af3bdae4..442eb363709d2 100644
key.frame_type = UseCustomFrame() key.frame_type = UseCustomFrame()
? ui::ColorProviderManager::FrameType::kChromium ? ui::ColorProviderManager::FrameType::kChromium
: ui::ColorProviderManager::FrameType::kNative; : ui::ColorProviderManager::FrameType::kNative;
@@ -395,7 +425,8 @@ void BrowserFrame::SelectNativeTheme() { @@ -395,7 +427,8 @@ void BrowserFrame::SelectNativeTheme() {
// Select between regular, dark and GTK theme. // Select between regular, dark and GTK theme.
ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
@ -155,7 +164,7 @@ index f3cc4af3bdae4..442eb363709d2 100644
// No matter if we are using the default theme or not we always use the dark // No matter if we are using the default theme or not we always use the dark
// ui instance. // ui instance.
SetNativeTheme(ui::NativeTheme::GetInstanceForDarkUI()); SetNativeTheme(ui::NativeTheme::GetInstanceForDarkUI());
@@ -408,7 +439,8 @@ void BrowserFrame::SelectNativeTheme() { @@ -408,7 +441,8 @@ void BrowserFrame::SelectNativeTheme() {
// display_override so the web contents can blend with the overlay by using // display_override so the web contents can blend with the overlay by using
// the developer-provided theme color for a better experience. Context: // the developer-provided theme color for a better experience. Context:
// https://crbug.com/1219073. // https://crbug.com/1219073.