mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-18 05:00:48 +01:00
Update to Chromium version 123.0.6312.28
This commit is contained in:
parent
a58aaabcf8
commit
3be7c0098f
@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/123.0.6312.22',
|
'chromium_checkout': 'refs/tags/123.0.6312.28',
|
||||||
'depot_tools_checkout': 'cb43b5d82d'
|
'depot_tools_checkout': 'cb43b5d82d'
|
||||||
}
|
}
|
||||||
|
@ -529,10 +529,10 @@ index cbe655d5879d6..a72c3450d1fa7 100644
|
|||||||
break;
|
break;
|
||||||
case ui::SHOW_STATE_END:
|
case ui::SHOW_STATE_END:
|
||||||
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
||||||
index 02a88fb4174c7..3b4ae49f9ca93 100644
|
index 0a60563a52cb4..5a2cbcd8aa331 100644
|
||||||
--- ui/views/widget/widget.cc
|
--- ui/views/widget/widget.cc
|
||||||
+++ ui/views/widget/widget.cc
|
+++ ui/views/widget/widget.cc
|
||||||
@@ -399,7 +399,8 @@ void Widget::Init(InitParams params) {
|
@@ -400,7 +400,8 @@ void Widget::Init(InitParams params) {
|
||||||
}
|
}
|
||||||
|
|
||||||
params.child |= (params.type == InitParams::TYPE_CONTROL);
|
params.child |= (params.type == InitParams::TYPE_CONTROL);
|
||||||
@ -542,7 +542,7 @@ index 02a88fb4174c7..3b4ae49f9ca93 100644
|
|||||||
is_headless_ = params.ShouldInitAsHeadless();
|
is_headless_ = params.ShouldInitAsHeadless();
|
||||||
|
|
||||||
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
|
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
|
||||||
@@ -497,9 +498,14 @@ void Widget::Init(InitParams params) {
|
@@ -498,9 +499,14 @@ void Widget::Init(InitParams params) {
|
||||||
|
|
||||||
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
|
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
|
||||||
Maximize();
|
Maximize();
|
||||||
@ -557,7 +557,7 @@ index 02a88fb4174c7..3b4ae49f9ca93 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
@@ -513,7 +519,12 @@ void Widget::Init(InitParams params) {
|
@@ -514,7 +520,12 @@ void Widget::Init(InitParams params) {
|
||||||
} else if (delegate) {
|
} else if (delegate) {
|
||||||
SetContentsView(delegate->TransferOwnershipOfContentsView());
|
SetContentsView(delegate->TransferOwnershipOfContentsView());
|
||||||
if (should_set_initial_bounds) {
|
if (should_set_initial_bounds) {
|
||||||
@ -571,7 +571,7 @@ index 02a88fb4174c7..3b4ae49f9ca93 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1659,10 +1670,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
|
@@ -1660,10 +1671,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Size Widget::GetMinimumSize() const {
|
gfx::Size Widget::GetMinimumSize() const {
|
||||||
@ -588,7 +588,7 @@ index 02a88fb4174c7..3b4ae49f9ca93 100644
|
|||||||
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
|
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1913,7 +1930,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
|
@@ -1914,7 +1931,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
|
||||||
return false;
|
return false;
|
||||||
View* v = widget_delegate_->GetInitiallyFocusedView();
|
View* v = widget_delegate_->GetInitiallyFocusedView();
|
||||||
if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
|
if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
|
||||||
|
@ -62,7 +62,7 @@ index db7f1cb1b0f68..4c70aa22d0a34 100644
|
|||||||
gfx::Transform device_emulation_transform_;
|
gfx::Transform device_emulation_transform_;
|
||||||
|
|
||||||
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
|
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||||
index 59f54f7f98dd6..481e1991a77ac 100644
|
index bc0a65ed90b64..f346c3b050fae 100644
|
||||||
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
|
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||||
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
|
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||||
@@ -981,7 +981,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
@@ -981,7 +981,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user