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 135.0.7049.0 (#1427262)

Browse Source
This commit is contained in:
Marshall Greenblatt
2025-03-10 15:57:41 -04:00
parent cda47aaff4
commit ff5210f825
86 changed files with 732 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 7603c2662b8dc..9a38d816bdc40 100644
return false;
}
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
index 4f2fdafea29b3..dc69a82b32245 100644
index 615de49f749ac..dc02b861c6e4c 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -38,6 +38,7 @@
@ -24,7 +24,7 @@ index 4f2fdafea29b3..dc69a82b32245 100644
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
@@ -1217,6 +1218,13 @@ DevToolsWindow* DevToolsWindow::Create(
@@ -1218,6 +1219,13 @@ DevToolsWindow* DevToolsWindow::Create(
!browser->is_type_normal()) {
can_dock = false;
}
@ -38,7 +38,7 @@ index 4f2fdafea29b3..dc69a82b32245 100644
}
// Create WebContents with devtools.
@@ -1676,9 +1684,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
@@ -1677,9 +1685,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
if (!inspected_web_contents ||
!inspected_web_contents->OpenURL(params,
/*navigation_handle_callback=*/{})) {
@ -52,7 +52,7 @@ index 4f2fdafea29b3..dc69a82b32245 100644
}
}
@@ -1841,12 +1853,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
@@ -1842,12 +1854,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
Browser::CreationStatus::kOk) {
return;
}
@ -88,7 +88,7 @@ index 4f2fdafea29b3..dc69a82b32245 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index a66522f120f6f..4c8ffb85841f8 100644
index 0ed6e9e434350..5c8bcd5c45ede 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/compiler/compiler.gni")
@ -99,7 +99,7 @@ index a66522f120f6f..4c8ffb85841f8 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -299,6 +300,10 @@ static_library("ui") {
@@ -301,6 +302,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -110,7 +110,7 @@ index a66522f120f6f..4c8ffb85841f8 100644
public_deps = [
# WARNING WARNING WARNING
# New dependencies outside of //chrome/browser should be added to
@@ -326,6 +331,7 @@ static_library("ui") {
@@ -328,6 +333,7 @@ static_library("ui") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/linux/dbus:buildflags",
"//cc/paint",
@ -118,7 +118,7 @@ index a66522f120f6f..4c8ffb85841f8 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -695,6 +701,13 @@ static_library("ui") {
@@ -698,6 +704,13 @@ static_library("ui") {
deps += [ "//components/plus_addresses/resources:vector_icons" ]
}
@ -132,7 +132,7 @@ index a66522f120f6f..4c8ffb85841f8 100644
# TODO(crbug.com/41437292): Remove this circular dependency.
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
# These are all-platform circular includes.
@@ -5471,6 +5484,7 @@ static_library("ui") {
@@ -5476,6 +5489,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -141,7 +141,7 @@ index a66522f120f6f..4c8ffb85841f8 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 3d0ffcbb38c23..04830b0062651 100644
index fafd84d08e336..a17aad8f37537 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -268,6 +268,25 @@
@ -194,7 +194,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1399,6 +1428,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1404,6 +1433,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -203,7 +203,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1740,6 +1771,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1752,6 +1783,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
return content::KeyboardEventProcessingResult::HANDLED;
}
@ -218,7 +218,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1747,8 +1786,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1759,8 +1798,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -239,7 +239,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1843,9 +1892,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) {
@@ -1855,9 +1904,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) {
content::PreloadingEligibility Browser::IsPrerender2Supported(
content::WebContents& web_contents,
content::PreloadingTriggerType trigger_type) {
@ -254,7 +254,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
bool Browser::ShouldShowStaleContentOnEviction(content::WebContents* source) {
@@ -1908,6 +1962,14 @@ WebContents* Browser::OpenURLFromTab(
@@ -1920,6 +1974,14 @@ WebContents* Browser::OpenURLFromTab(
std::move(navigation_handle_callback));
}
@ -269,7 +269,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -2081,6 +2143,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -2093,6 +2155,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -278,7 +278,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -2110,6 +2174,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -2122,6 +2186,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -287,7 +287,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
if (!GetStatusBubble()) {
return;
}
@@ -2119,6 +2185,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -2131,6 +2197,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
}
}
@ -305,7 +305,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::EventType::kMouseExited;
@@ -2147,6 +2224,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -2159,6 +2236,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -325,7 +325,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2259,12 +2349,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -2271,12 +2361,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// to track `new_contents` after it is added to its TabModel this override can
// be removed.
CreateSessionServiceTabHelper(new_contents);
@ -350,7 +350,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
// Don't show the page hung dialog when a HTML popup hangs because
// the dialog will take the focus and immediately close the popup.
RenderWidgetHostView* view = render_widget_host->GetView();
@@ -2277,6 +2379,13 @@ void Browser::RendererUnresponsive(
@@ -2289,6 +2391,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@ -364,7 +364,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2286,6 +2395,15 @@ void Browser::RendererResponsive(
@@ -2298,6 +2407,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
@ -380,7 +380,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2321,6 +2439,11 @@ void Browser::DraggableRegionsChanged(
@@ -2333,6 +2451,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@ -392,7 +392,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
void Browser::DidFinishNavigation(
@@ -2403,11 +2526,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2415,11 +2538,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -408,7 +408,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2617,6 +2744,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2629,6 +2756,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -424,7 +424,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -3192,9 +3328,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -3211,9 +3347,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -436,7 +436,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -3202,6 +3339,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -3221,6 +3358,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -449,7 +449,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
return nullptr;
}
@@ -3351,6 +3494,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3370,6 +3513,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -458,7 +458,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3511,6 +3656,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3530,6 +3675,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -474,7 +474,7 @@ index 3d0ffcbb38c23..04830b0062651 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index fa28d4500e08d..c759623e8df87 100644
index 8fda0dfbe8e10..a48a32fe5d08e 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -24,6 +24,7 @@
@ -539,7 +539,7 @@ index fa28d4500e08d..c759623e8df87 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -961,10 +988,18 @@ class Browser : public TabStripModelObserver,
@@ -966,10 +993,18 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -558,9 +558,9 @@ index fa28d4500e08d..c759623e8df87 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1302,6 +1337,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@@ -1310,6 +1345,10 @@ class Browser : public TabStripModelObserver,
// The active state of this browser.
bool is_active_ = false;
+#if BUILDFLAG(ENABLE_CEF)
+ std::unique_ptr<cef::BrowserDelegate> cef_browser_delegate_;
@ -569,7 +569,7 @@ index fa28d4500e08d..c759623e8df87 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1368,6 +1407,8 @@ class Browser : public TabStripModelObserver,
@@ -1376,6 +1415,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -613,7 +613,7 @@ index cefd4bc59943a..69425ab604ddb 100644
bool IsHostAllowedInIncognito(const GURL& url) {
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
index f12ba73369a65..23c43dcb1dd24 100644
index 83a510defbda5..f4305701c5f5a 100644
--- chrome/browser/ui/browser_tabstrip.cc
+++ chrome/browser/ui/browser_tabstrip.cc
@@ -33,9 +33,13 @@ content::WebContents* AddAndReturnTabAt(
@ -631,7 +631,7 @@ index f12ba73369a65..23c43dcb1dd24 100644
params.disposition = foreground ? WindowOpenDisposition::NEW_FOREGROUND_TAB
: WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.tabstrip_index = idx;
@@ -85,6 +89,16 @@ content::WebContents* AddWebContents(
@@ -86,6 +90,16 @@ content::WebContents* AddWebContents(
// Can't create a new contents for the current tab - invalid case.
DCHECK(disposition != WindowOpenDisposition::CURRENT_TAB);
@ -649,10 +649,10 @@ index f12ba73369a65..23c43dcb1dd24 100644
params.source_contents = source_contents;
params.url = target_url;
diff --git chrome/browser/ui/browser_window/browser_window_features.cc chrome/browser/ui/browser_window/browser_window_features.cc
index e584d77d67bda..a38a8504abd85 100644
index 0cdf3de9047f3..291fe0fb0e81e 100644
--- chrome/browser/ui/browser_window/browser_window_features.cc
+++ chrome/browser/ui/browser_window/browser_window_features.cc
@@ -67,6 +67,14 @@ BrowserWindowFeatures::BrowserWindowFeaturesFactory& GetFactory() {
@@ -73,6 +73,14 @@ BrowserWindowFeatures::BrowserWindowFeaturesFactory& GetFactory() {
return *factory;
}
@ -667,7 +667,7 @@ index e584d77d67bda..a38a8504abd85 100644
} // namespace
// static
@@ -153,10 +161,12 @@ void BrowserWindowFeatures::Init(BrowserWindowInterface* browser) {
@@ -162,10 +170,12 @@ void BrowserWindowFeatures::Init(BrowserWindowInterface* browser) {
}
void BrowserWindowFeatures::InitPostWindowConstruction(Browser* browser) {
@ -681,7 +681,7 @@ index e584d77d67bda..a38a8504abd85 100644
if (IsChromeLabsEnabled()) {
chrome_labs_coordinator_ =
std::make_unique<ChromeLabsCoordinator>(browser);
@@ -198,7 +208,7 @@ void BrowserWindowFeatures::InitPostWindowConstruction(Browser* browser) {
@@ -207,7 +217,7 @@ void BrowserWindowFeatures::InitPostWindowConstruction(Browser* browser) {
}
}
@ -690,7 +690,7 @@ index e584d77d67bda..a38a8504abd85 100644
base::FeatureList::IsEnabled(toast_features::kToastFramework)) {
toast_service_ = std::make_unique<ToastService>(browser);
}
@@ -231,10 +241,12 @@ void BrowserWindowFeatures::InitPostBrowserViewConstruction(
@@ -240,10 +250,12 @@ void BrowserWindowFeatures::InitPostBrowserViewConstruction(
browser_view->browser(),
side_panel_coordinator_->GetWindowRegistry());
@ -701,6 +701,6 @@ index e584d77d67bda..a38a8504abd85 100644
// some unit tests without browser view.
- if (browser_view->GetIsNormalType()) {
+ if (supports_toolbar) {
memory_saver_opt_in_iph_controller_ =
std::make_unique<MemorySaverOptInIPHController>(
browser_view->browser());
#if BUILDFLAG(ENABLE_GLIC)
if (glic::GlicEnabling::IsProfileEligible(
browser_view->browser()->profile())) {