mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-17 20:50:42 +01:00
Update to Chromium version 121.0.6167.139
This commit is contained in:
parent
c6b2e4d3d2
commit
2af7b91155
@ -7,6 +7,6 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/121.0.6167.86',
|
||||
'chromium_checkout': 'refs/tags/121.0.6167.139',
|
||||
'depot_tools_checkout': '6444de14d1'
|
||||
}
|
||||
|
@ -363,7 +363,7 @@ index 0c231b6ac5b01..6b5af98e18e42 100644
|
||||
BrowserFrame(const BrowserFrame&) = delete;
|
||||
BrowserFrame& operator=(const BrowserFrame&) = delete;
|
||||
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
|
||||
index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
index e3df2658b7ae3..0a237a11435d6 100644
|
||||
--- chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -345,11 +345,10 @@ using content::NativeWebKeyboardEvent;
|
||||
@ -488,7 +488,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
|
||||
}
|
||||
|
||||
@@ -3078,7 +3113,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
|
||||
@@ -3081,7 +3116,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
|
||||
}
|
||||
|
||||
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
|
||||
@ -498,7 +498,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
|
||||
return download_button->bubble_controller();
|
||||
return nullptr;
|
||||
@@ -3629,7 +3665,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
@@ -3632,7 +3668,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
|
||||
if (top_container()->parent() == this)
|
||||
return;
|
||||
|
||||
@ -508,7 +508,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
top_container()->DestroyLayer();
|
||||
AddChildViewAt(top_container(), 0);
|
||||
EnsureFocusOrder();
|
||||
@@ -4091,11 +4128,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
|
||||
@@ -4094,11 +4131,38 @@ void BrowserView::GetAccessiblePanes(std::vector<views::View*>* panes) {
|
||||
bool BrowserView::ShouldDescendIntoChildForEventHandling(
|
||||
gfx::NativeView child,
|
||||
const gfx::Point& location) {
|
||||
@ -549,7 +549,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
// Draggable regions are defined relative to the web contents.
|
||||
gfx::Point point_in_contents_web_view_coords(location);
|
||||
views::View::ConvertPointToTarget(GetWidget()->GetRootView(),
|
||||
@@ -4104,7 +4168,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
|
||||
@@ -4107,7 +4171,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling(
|
||||
|
||||
// Draggable regions should be ignored for clicks into any browser view's
|
||||
// owned widgets, for example alerts, permission prompts or find bar.
|
||||
@ -558,7 +558,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
point_in_contents_web_view_coords.x(),
|
||||
point_in_contents_web_view_coords.y()) ||
|
||||
WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords);
|
||||
@@ -4212,8 +4276,10 @@ void BrowserView::Layout() {
|
||||
@@ -4215,8 +4279,10 @@ void BrowserView::Layout() {
|
||||
|
||||
// TODO(jamescook): Why was this in the middle of layout code?
|
||||
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
|
||||
@ -571,7 +571,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// In chromeOS ash we round the bottom two corners of the browser frame by
|
||||
@@ -4291,6 +4357,11 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -4294,6 +4360,11 @@ void BrowserView::AddedToWidget() {
|
||||
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
|
||||
#endif
|
||||
|
||||
@ -583,7 +583,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
toolbar_->Init();
|
||||
|
||||
// TODO(pbos): Investigate whether the side panels should be creatable when
|
||||
@@ -4339,13 +4410,9 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -4342,13 +4413,9 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
EnsureFocusOrder();
|
||||
|
||||
@ -599,7 +599,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
using_native_frame_ = frame_->ShouldUseNativeFrame();
|
||||
|
||||
MaybeInitializeWebUITabStrip();
|
||||
@@ -4767,7 +4834,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
@@ -4770,7 +4837,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
|
||||
// Undo our anti-jankiness hacks and force a re-layout.
|
||||
in_process_fullscreen_ = false;
|
||||
ToolbarSizeChanged(false);
|
||||
@ -609,7 +609,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
}
|
||||
|
||||
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
|
||||
@@ -5165,6 +5233,8 @@ Profile* BrowserView::GetProfile() {
|
||||
@@ -5168,6 +5236,8 @@ Profile* BrowserView::GetProfile() {
|
||||
}
|
||||
|
||||
void BrowserView::UpdateUIForTabFullscreen() {
|
||||
@ -618,7 +618,7 @@ index 5392c8ddc6f13..153ad48fc65ba 100644
|
||||
frame()->GetFrameView()->UpdateFullscreenTopUI();
|
||||
}
|
||||
|
||||
@@ -5187,6 +5257,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
@@ -5190,6 +5260,8 @@ void BrowserView::HideDownloadShelf() {
|
||||
}
|
||||
|
||||
bool BrowserView::CanUserExitFullscreen() const {
|
||||
|
Loading…
x
Reference in New Issue
Block a user