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 100.0.4896.0 (#972766)

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-02-21 17:23:40 -05:00
parent a2c621bf8b
commit f97f0bbda6
120 changed files with 668 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
patch/patches/chrome_runtime_views.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 92f10fac6b017..cc53da3a0b32e 100644
index cff1df2490bb6..9d156bd9993fa 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -368,8 +368,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -371,8 +371,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// CommandUpdaterDelegate and CommandUpdater declare this function so we
// choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set).
@ -14,7 +14,7 @@ index 92f10fac6b017..cc53da3a0b32e 100644
// No commands are enabled if there is not yet any selected tab.
// TODO(pkasting): It seems like we should not need this, because either
@@ -979,11 +981,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -985,11 +987,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@ -29,12 +29,12 @@ index 92f10fac6b017..cc53da3a0b32e 100644
+ browser_->toolbar_overridden();
}
void BrowserCommandController::InitCommandState() {
bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 6264562165ced..d20f970ba1254 100644
index 6b644bf006532..9ae5bd273b6dc 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -73,15 +73,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@@ -74,15 +74,23 @@ bool IsUsingGtkTheme(Profile* profile) {
////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public:
@ -60,7 +60,7 @@ index 6264562165ced..d20f970ba1254 100644
}
BrowserFrame::~BrowserFrame() {}
@@ -141,6 +149,12 @@ gfx::Rect BrowserFrame::GetBoundsForTabStripRegion(
@@ -143,6 +151,12 @@ gfx::Rect BrowserFrame::GetBoundsForTabStripRegion(
}
int BrowserFrame::GetTopInset() const {
@ -73,7 +73,7 @@ index 6264562165ced..d20f970ba1254 100644
return browser_frame_view_->GetTopInset(false);
}
@@ -175,15 +189,21 @@ void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
@@ -177,15 +191,21 @@ void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
content::KeyboardEventProcessingResult BrowserFrame::PreHandleKeyboardEvent(
const content::NativeWebKeyboardEvent& event) {
@ -95,27 +95,37 @@ index 6264562165ced..d20f970ba1254 100644
browser_frame_view_->OnBrowserViewInitViewsComplete();
}
@@ -244,6 +264,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
@@ -246,6 +266,8 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
ui::ColorProviderManager::InitializerSupplier* BrowserFrame::GetCustomTheme()
const {
+ if (!browser_view_)
+ return nullptr;
Browser* browser = browser_view_->browser();
auto* app_controller = browser->app_controller();
// Ignore GTK+ for web apps with window-controls-overlay as the
@@ -369,7 +391,8 @@ void BrowserFrame::SelectNativeTheme() {
// If this is an incognito profile, there should never be a custom theme.
if (browser->profile()->IsIncognitoProfile())
@@ -374,7 +396,8 @@ void BrowserFrame::SelectNativeTheme() {
// Select between regular, dark and GTK theme.
ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi();
- if (browser_view_->browser()->profile()->IsIncognitoProfile()) {
+ if (browser_view_ &&
+ browser_view_->browser()->profile()->IsIncognitoProfile()) {
// If the flag is enabled, then no matter if we are using the default theme
// or not we always use the dark ui instance.
if (base::FeatureList::IsEnabled(
// No matter if we are using the default theme or not we always use the dark
// ui instance.
SetNativeTheme(ui::NativeTheme::GetInstanceForDarkUI());
@@ -387,7 +410,8 @@ void BrowserFrame::SelectNativeTheme() {
// display_override so the web contents can blend with the overlay by using
// the developer-provided theme color for a better experience. Context:
// https://crbug.com/1219073.
- if (linux_ui && !browser_view_->AppUsesWindowControlsOverlay()) {
+ if (linux_ui &&
+ (!browser_view_ || !browser_view_->AppUsesWindowControlsOverlay())) {
native_theme = linux_ui->GetNativeTheme(GetNativeWindow());
}
#endif
diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
index 6a1e9abbc66aa..aa9e3ebe2599c 100644
index 67496d7ab6c50..fa97b9abe6253 100644
--- chrome/browser/ui/views/frame/browser_frame.h
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -53,7 +53,9 @@ enum class TabDragKind {
@ -129,10 +139,10 @@ index 6a1e9abbc66aa..aa9e3ebe2599c 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 8138e50a55072..e01b2274119b8 100644
index 0f9a2e8b91715..355bdf6fa9074 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -291,11 +291,10 @@ using content::WebContents;
@@ -297,11 +297,10 @@ using content::WebContents;
using views::ColumnSet;
using web_modal::WebContentsModalDialogHost;
@ -147,7 +157,7 @@ index 8138e50a55072..e01b2274119b8 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -683,11 +682,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
@@ -689,11 +688,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@ -171,7 +181,7 @@ index 8138e50a55072..e01b2274119b8 100644
SetShowIcon(::ShouldShowWindowIcon(browser_.get()));
// In forced app mode, all size controls are always disabled. Otherwise, use
@@ -701,7 +711,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -727,7 +737,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@ -179,7 +189,7 @@ index 8138e50a55072..e01b2274119b8 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -749,8 +758,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -770,8 +779,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@ -197,7 +207,7 @@ index 8138e50a55072..e01b2274119b8 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1587,6 +1603,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1646,6 +1662,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@ -206,7 +216,7 @@ index 8138e50a55072..e01b2274119b8 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -2731,7 +2749,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
@@ -2824,7 +2842,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
}
void BrowserView::ReparentTopContainerForEndOfImmersive() {
@ -216,7 +226,7 @@ index 8138e50a55072..e01b2274119b8 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3220,8 +3239,10 @@ void BrowserView::Layout() {
@@ -3313,8 +3332,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -229,7 +239,7 @@ index 8138e50a55072..e01b2274119b8 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3284,6 +3305,11 @@ void BrowserView::AddedToWidget() {
@@ -3380,6 +3401,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -241,7 +251,7 @@ index 8138e50a55072..e01b2274119b8 100644
toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3336,13 +3362,9 @@ void BrowserView::AddedToWidget() {
@@ -3432,13 +3458,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -257,7 +267,7 @@ index 8138e50a55072..e01b2274119b8 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -3761,7 +3783,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -3859,7 +3881,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -267,7 +277,7 @@ index 8138e50a55072..e01b2274119b8 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4052,6 +4075,8 @@ Profile* BrowserView::GetProfile() {
@@ -4186,6 +4209,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -276,7 +286,7 @@ index 8138e50a55072..e01b2274119b8 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4074,6 +4099,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4208,6 +4233,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -286,10 +296,10 @@ index 8138e50a55072..e01b2274119b8 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 02d9793dd5c8d..fe8b0cef88375 100644
index a8abae057e699..c237aae395be8 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -125,11 +125,16 @@ class BrowserView : public BrowserWindow,
@@ -127,11 +127,16 @@ class BrowserView : public BrowserWindow,
public webapps::AppBannerManager::Observer {
public:
METADATA_HEADER(BrowserView);
@ -306,7 +316,7 @@ index 02d9793dd5c8d..fe8b0cef88375 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; }
@@ -705,6 +710,12 @@ class BrowserView : public BrowserWindow,
@@ -723,6 +728,12 @@ class BrowserView : public BrowserWindow,
const std::map<std::string, std::string>& extra_data) override;
#endif
@ -320,7 +330,7 @@ index 02d9793dd5c8d..fe8b0cef88375 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable.
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index 1d22e4b057c6c..d73b547f09e0b 100644
index 5f8af5f46bf46..54aba6eb904d6 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -40,6 +40,10 @@
@ -347,10 +357,10 @@ index 1d22e4b057c6c..d73b547f09e0b 100644
bool toolbar_visible = delegate_->IsToolbarVisible();
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index b5706099ce923..07cebc2f8b65f 100644
index 9a42c3bd2207b..4de0fb1b33bce 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -559,37 +559,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -563,37 +563,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
}
bool BrowserTabStripController::IsFrameCondensed() const {
@ -405,10 +415,10 @@ index b5706099ce923..07cebc2f8b65f 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index b5098154b2f7e..4a3121cedf083 100644
index 5ea77d3196bc0..1be02aea8cec6 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -168,12 +168,13 @@ auto& GetViewCommandMap() {
@@ -169,12 +169,13 @@ auto& GetViewCommandMap() {
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public:
@ -424,7 +434,7 @@ index b5098154b2f7e..4a3121cedf083 100644
SetID(VIEW_ID_TOOLBAR);
UpgradeDetector::GetInstance()->AddObserver(this);
@@ -208,7 +209,7 @@ void ToolbarView::Init() {
@@ -209,7 +210,7 @@ void ToolbarView::Init() {
#endif
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
@ -434,10 +444,10 @@ index b5098154b2f7e..4a3121cedf083 100644
size_animation_.Reset(1);
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index 79efc97f711f1..6915479340275 100644
index a60109508b7f5..3df342afd279b 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -93,7 +93,8 @@ class ToolbarView : public views::AccessiblePaneView,
@@ -94,7 +94,8 @@ class ToolbarView : public views::AccessiblePaneView,
// needs to be displayed.
};