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 104.0.5112.0 (#1012729)

Browse Source 
- Mac: 10.13 is now the minimum required macOS version
This commit is contained in:
Marshall Greenblatt
2022-06-17 16:28:55 +03:00
parent 35654cd709
commit c7ea0c5958
96 changed files with 659 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patch/patches/chrome_browser_browser.patch
View File

@@ -1,19 +1,19 @@
diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
index 9e534ff1683f1..de406f5879be0 100644
index 3285e422f76c1..5f35b91897b75 100644
--- chrome/browser/browser_about_handler.cc
+++ chrome/browser/browser_about_handler.cc
@@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
FROM_HERE, base::BindOnce(&chrome::AttemptExit));
return true;
}
+ if (base::LowerCaseEqualsASCII(spec, "chrome://ignore/")) {
+ if (base::EqualsCaseInsensitiveASCII(spec, "chrome://ignore/")) {
+ return true;
+ }
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 87a0e51cf2dca..e13acd86314ae 100644
index 66bece3638bf5..87e059da1256c 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@@ -23,8 +23,8 @@ index 87a0e51cf2dca..e13acd86314ae 100644
+import("//cef/libcef/features/features.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
@@ -365,6 +366,10 @@ static_library("ui") {
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -373,6 +374,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -35,7 +35,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -387,6 +392,7 @@ static_library("ui") {
@@ -395,6 +400,7 @@ static_library("ui") {
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//cc/paint",
@@ -43,7 +43,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -5410,6 +5416,7 @@ static_library("ui") {
@@ -5461,6 +5467,7 @@ static_library("ui") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
@@ -52,7 +52,7 @@ index 87a0e51cf2dca..e13acd86314ae 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index fe7fafc5ee148..8a0e2dc5c7cc0 100644
index 63d64acc72318..fd3cb52daf611 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@@ -81,7 +81,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -510,6 +529,13 @@ Browser::Browser(const CreateParams& params)
@@ -513,6 +532,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@@ -95,7 +95,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1323,6 +1349,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1329,6 +1355,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -110,7 +110,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1330,8 +1364,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1336,8 +1370,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -131,7 +131,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1536,6 +1580,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1544,6 +1588,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@@ -146,7 +146,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1665,6 +1717,15 @@ void Browser::AddNewContents(WebContents* source,
@@ -1673,6 +1725,15 @@ void Browser::AddNewContents(WebContents* source,
return;
}
@@ -162,7 +162,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect, window_action);
}
@@ -1683,6 +1744,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1691,6 +1752,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -171,7 +171,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1710,6 +1773,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1718,6 +1781,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -180,7 +180,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
if (!GetStatusBubble())
return;
@@ -1717,6 +1782,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1725,6 +1790,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -198,7 +198,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1741,6 +1817,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -1749,6 +1825,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@@ -218,7 +218,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1833,6 +1922,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1841,6 +1930,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -229,7 +229,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1877,6 +1970,8 @@ void Browser::RendererResponsive(
@@ -1885,6 +1978,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -238,7 +238,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1937,11 +2032,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1945,11 +2040,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@@ -254,7 +254,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2654,13 +2753,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2664,13 +2763,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@@ -276,7 +276,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
return window_ ? window_->GetStatusBubble() : nullptr;
}
@@ -2787,6 +2893,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2797,6 +2903,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
}
@@ -286,7 +286,7 @@ index fe7fafc5ee148..8a0e2dc5c7cc0 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 631c30c8f153e..bdd07951171eb 100644
index 87859f4741386..1346cdb60631d 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@@ -308,7 +308,7 @@ index 631c30c8f153e..bdd07951171eb 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -305,6 +310,11 @@ class Browser : public TabStripModelObserver,
@@ -316,6 +321,11 @@ class Browser : public TabStripModelObserver,
// maximizable.
bool can_maximize = true;
@@ -320,7 +320,7 @@ index 631c30c8f153e..bdd07951171eb 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -372,6 +382,13 @@ class Browser : public TabStripModelObserver,
@@ -383,6 +393,13 @@ class Browser : public TabStripModelObserver,
return creation_source_ == CreationSource::kSessionRestore;
}
@@ -334,7 +334,7 @@ index 631c30c8f153e..bdd07951171eb 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -445,6 +462,12 @@ class Browser : public TabStripModelObserver,
@@ -456,6 +473,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@@ -347,7 +347,7 @@ index 631c30c8f153e..bdd07951171eb 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -814,11 +837,19 @@ class Browser : public TabStripModelObserver,
@@ -825,11 +848,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -367,7 +367,7 @@ index 631c30c8f153e..bdd07951171eb 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1215,6 +1246,8 @@ class Browser : public TabStripModelObserver,
@@ -1226,6 +1257,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@@ -376,7 +376,7 @@ index 631c30c8f153e..bdd07951171eb 100644
CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_;
@@ -1281,6 +1314,10 @@ class Browser : public TabStripModelObserver,
@@ -1294,6 +1327,10 @@ class Browser : public TabStripModelObserver,
std::unique_ptr<screen_ai::AXScreenAIAnnotator> screen_ai_annotator_;
#endif
@@ -388,10 +388,10 @@ index 631c30c8f153e..bdd07951171eb 100644
// The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index fd72594b74be0..501ff17a214d2 100644
index 9315a947d5cb2..0d5d14ae56026 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -516,6 +516,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -518,6 +518,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);