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

Update to Chromium version 98.0.4758.55

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-01-13 13:07:07 +00:00
committed by Marshall Greenblatt
parent 16dbbdc695
commit a8dbe5cae2
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/98.0.4758.48', 'chromium_checkout': 'refs/tags/98.0.4758.55',
'depot_tools_checkout': 'db41eed6b7' 'depot_tools_checkout': 'db41eed6b7'
} }

18
patch/patches/chrome_runtime_views.patch
View File

@ -129,7 +129,7 @@ index 6a1e9abbc66aa..aa9e3ebe2599c 100644
BrowserFrame(const BrowserFrame&) = delete; BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(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 diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 3c6fcbebb84bb..db469505c4ab2 100644 index 15336e395156d..8fa18bd3b9ac5 100644
--- chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -291,11 +291,10 @@ using content::WebContents; @@ -291,11 +291,10 @@ using content::WebContents;
@ -147,7 +147,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation. // UMA histograms that record animation smoothness for tab loading animation.
@@ -677,11 +676,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver { @@ -683,11 +682,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// BrowserView, public: // BrowserView, public:
@ -171,7 +171,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
SetShowIcon(::ShouldShowWindowIcon(browser_.get())); SetShowIcon(::ShouldShowWindowIcon(browser_.get()));
// In forced app mode, all size controls are always disabled. Otherwise, use // In forced app mode, all size controls are always disabled. Otherwise, use
@@ -695,7 +705,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -701,7 +711,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
} }
browser_->tab_strip_model()->AddObserver(this); browser_->tab_strip_model()->AddObserver(this);
@ -179,7 +179,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
// Top container holds tab strip region and toolbar and lives at the front of // Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy. // the view hierarchy.
@@ -741,8 +750,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -747,8 +756,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>( contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_)); devtools_web_view_, contents_web_view_));
@ -197,7 +197,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
contents_separator_ = contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>()); top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1579,6 +1595,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { @@ -1585,6 +1601,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled()) if (immersive_mode_controller_->IsEnabled())
return false; return false;
@ -206,7 +206,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
} }
@@ -2725,7 +2743,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { @@ -2731,7 +2749,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
} }
void BrowserView::ReparentTopContainerForEndOfImmersive() { void BrowserView::ReparentTopContainerForEndOfImmersive() {
@ -216,7 +216,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -3214,8 +3233,10 @@ void BrowserView::Layout() { @@ -3220,8 +3239,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code? // TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -229,7 +229,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
// Some of the situations when the BrowserView is laid out are: // Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode. // - Enter/exit immersive fullscreen mode.
@@ -3278,6 +3299,11 @@ void BrowserView::AddedToWidget() { @@ -3284,6 +3305,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@ -241,7 +241,7 @@ index 3c6fcbebb84bb..db469505c4ab2 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button // TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3330,13 +3356,9 @@ void BrowserView::AddedToWidget() { @@ -3336,13 +3362,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();

6
patch/patches/print_preview_123.patch
View File

@ -46,7 +46,7 @@ index 1cf3cbf2a5ed0..09f43d550eebc 100644
#include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/task_manager/web_contents_tags.h" #include "chrome/browser/task_manager/web_contents_tags.h"
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index c9f1502da55d8..874c95c2db26c 100644 index aad37ff0fdbc4..b5780c7581b36 100644
--- chrome/browser/printing/print_view_manager_base.cc --- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc
@@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO( @@ -248,12 +248,13 @@ void UpdatePrintSettingsOnIO(
@ -66,7 +66,7 @@ index c9f1502da55d8..874c95c2db26c 100644
} }
auto* printer_query_ptr = printer_query.get(); auto* printer_query_ptr = printer_query.get();
printer_query_ptr->SetSettings( printer_query_ptr->SetSettings(
@@ -667,6 +668,7 @@ void PrintViewManagerBase::UpdatePrintSettings( @@ -675,6 +676,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
job_settings.SetIntKey(kSettingRasterizePdfDpi, value); job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
} }
@ -74,7 +74,7 @@ index c9f1502da55d8..874c95c2db26c 100644
auto callback_wrapper = auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
weak_ptr_factory_.GetWeakPtr(), std::move(callback)); weak_ptr_factory_.GetWeakPtr(), std::move(callback));
@@ -674,7 +676,9 @@ void PrintViewManagerBase::UpdatePrintSettings( @@ -682,7 +684,9 @@ void PrintViewManagerBase::UpdatePrintSettings(
FROM_HERE, FROM_HERE,
base::BindOnce(&UpdatePrintSettingsOnIO, cookie, base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
std::move(callback_wrapper), queue_, std::move(callback_wrapper), queue_,

2
patch/patches/services_network_2718.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index 124eb79407285..93371e667a9d2 100644 index b9de2bb2138d5..76a0dc58b8e2a 100644
--- content/browser/storage_partition_impl.cc --- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc
@@ -489,10 +489,6 @@ class LoginHandlerDelegate { @@ -489,10 +489,6 @@ class LoginHandlerDelegate {