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 125.0.6422.0 (#1287751)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-04-23 16:06:00 -04:00
parent 4fe529e2dc
commit b67cbc47e3
145 changed files with 1047 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
patch/patches/chrome_browser_browser.patch
View File

@ -13,10 +13,10 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
index c5eea1036e1eb..034b325c95f6b 100644
index 8fbc9ab537c6d..e87d068678767 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -35,6 +35,7 @@
@@ -37,6 +37,7 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/task_manager/web_contents_tags.h"
#include "chrome/browser/ui/browser.h"
@ -24,7 +24,7 @@ index c5eea1036e1eb..034b325c95f6b 100644
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
@@ -1223,6 +1224,13 @@ DevToolsWindow* DevToolsWindow::Create(
@@ -1235,6 +1236,13 @@ DevToolsWindow* DevToolsWindow::Create(
!browser->is_type_normal()) {
can_dock = false;
}
@ -38,7 +38,7 @@ index c5eea1036e1eb..034b325c95f6b 100644
}
// Create WebContents with devtools.
@@ -1845,12 +1853,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
@@ -1908,12 +1916,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
Browser::CreationStatus::kOk) {
return;
}
@ -74,7 +74,7 @@ index c5eea1036e1eb..034b325c95f6b 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 3fe3d6eddbf01..b1549c86523be 100644
index d6c14b3d70a75..577586f0dd8b4 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
@ -85,7 +85,7 @@ index 3fe3d6eddbf01..b1549c86523be 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -393,6 +394,10 @@ static_library("ui") {
@@ -401,6 +402,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -96,7 +96,7 @@ index 3fe3d6eddbf01..b1549c86523be 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
@@ -418,6 +423,7 @@ static_library("ui") {
@@ -426,6 +431,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@ -104,7 +104,7 @@ index 3fe3d6eddbf01..b1549c86523be 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -2936,6 +2942,8 @@ static_library("ui") {
@@ -2979,6 +2985,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@ -113,7 +113,7 @@ index 3fe3d6eddbf01..b1549c86523be 100644
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4996,8 +5004,6 @@ static_library("ui") {
@@ -5062,8 +5070,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h",
@ -122,7 +122,7 @@ index 3fe3d6eddbf01..b1549c86523be 100644
"views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -6813,6 +6819,7 @@ static_library("ui") {
@@ -6895,6 +6901,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -131,10 +131,10 @@ index 3fe3d6eddbf01..b1549c86523be 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 3d985470f60d1..762f0e827d53e 100644
index cf9de7df6299d..3f93ff73ab038 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@@ -267,6 +267,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@ -160,7 +160,7 @@ index 3d985470f60d1..762f0e827d53e 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -466,6 +485,10 @@ Browser::Browser(const CreateParams& params)
@@ -476,6 +495,10 @@ Browser::Browser(const CreateParams& params)
type_(params.type),
profile_(params.profile),
window_(nullptr),
@ -171,7 +171,7 @@ index 3d985470f60d1..762f0e827d53e 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -679,6 +702,12 @@ Browser::~Browser() {
@@ -678,6 +701,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@ -184,7 +184,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1110,6 +1139,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1109,6 +1138,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@ -193,7 +193,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1451,6 +1482,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1450,6 +1481,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -208,7 +208,7 @@ index 3d985470f60d1..762f0e827d53e 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1458,8 +1497,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1457,8 +1496,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -229,13 +229,15 @@ index 3d985470f60d1..762f0e827d53e 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1658,6 +1707,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1660,6 +1709,16 @@ WebContents* Browser::OpenURLFromTab(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(ENABLE_CEF)
+ if (cef_browser_delegate_) {
+ auto web_contents = cef_browser_delegate_->OpenURLFromTab(source, params);
+ auto web_contents =
+ cef_browser_delegate_->OpenURLFromTabEx(source, params,
+ navigation_handle_callback);
+ if (!web_contents)
+ return nullptr;
+ }
@ -244,7 +246,7 @@ index 3d985470f60d1..762f0e827d53e 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1815,6 +1872,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1822,6 +1881,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -253,7 +255,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1843,6 +1902,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1850,6 +1911,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -262,7 +264,7 @@ index 3d985470f60d1..762f0e827d53e 100644
if (!GetStatusBubble())
return;
@@ -1850,6 +1911,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1857,6 +1920,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -280,7 +282,7 @@ index 3d985470f60d1..762f0e827d53e 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1874,6 +1946,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -1881,6 +1955,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -300,7 +302,7 @@ index 3d985470f60d1..762f0e827d53e 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1973,12 +2058,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1980,12 +2067,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -325,7 +327,7 @@ index 3d985470f60d1..762f0e827d53e 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();
@@ -1991,6 +2088,13 @@ void Browser::RendererUnresponsive(
@@ -1998,6 +2097,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@ -339,7 +341,19 @@ index 3d985470f60d1..762f0e827d53e 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2117,11 +2221,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2051,6 +2157,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
+#if BUILDFLAG(ENABLE_CEF)
+ else if (cef_delegate()) {
+ cef_delegate()->DraggableRegionsChanged(regions, contents);
+ }
+#endif
}
void Browser::DidFinishNavigation(
@@ -2132,11 +2243,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -355,7 +369,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2321,6 +2429,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2336,6 +2451,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -371,7 +385,7 @@ index 3d985470f60d1..762f0e827d53e 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2864,9 +2981,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2880,9 +3004,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -384,7 +398,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -2874,6 +2993,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -2890,6 +3016,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@ -397,7 +411,7 @@ index 3d985470f60d1..762f0e827d53e 100644
return nullptr;
}
@@ -3010,6 +3135,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3026,6 +3158,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -406,7 +420,7 @@ index 3d985470f60d1..762f0e827d53e 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3164,6 +3291,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3180,6 +3314,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@ -422,7 +436,7 @@ index 3d985470f60d1..762f0e827d53e 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 4f393fa78e991..a486d6f7f1571 100644
index 6a3a4af355be9..b04d27dab01ed 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@ -433,7 +447,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
#include "chrome/browser/tab_contents/web_contents_collection.h"
#include "chrome/browser/themes/theme_service_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
@@ -48,6 +49,10 @@
@@ -49,6 +50,10 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/shell_dialogs/select_file_dialog.h"
@ -444,7 +458,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -347,6 +352,15 @@ class Browser : public TabStripModelObserver,
@@ -365,6 +370,15 @@ class Browser : public TabStripModelObserver,
// Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
std::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
@ -460,7 +474,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -428,6 +442,13 @@ class Browser : public TabStripModelObserver,
@@ -446,6 +460,13 @@ class Browser : public TabStripModelObserver,
update_ui_immediately_for_testing_ = true;
}
@ -474,7 +488,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -502,6 +523,12 @@ class Browser : public TabStripModelObserver,
@@ -536,6 +557,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
base::WeakPtr<const Browser> AsWeakPtr() const;
@ -487,7 +501,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -908,11 +935,19 @@ class Browser : public TabStripModelObserver,
@@ -947,11 +974,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -507,7 +521,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1252,6 +1287,10 @@ class Browser : public TabStripModelObserver,
@@ -1289,6 +1324,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@ -518,7 +532,7 @@ index 4f393fa78e991..a486d6f7f1571 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1318,6 +1357,8 @@ class Browser : public TabStripModelObserver,
@@ -1355,6 +1394,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -528,10 +542,10 @@ index 4f393fa78e991..a486d6f7f1571 100644
UnloadController unload_controller_;
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 151c73f9d7a18..e02316efd4011 100644
index cefb9f62051fe..6e19377f78e4f 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -305,6 +305,10 @@ std::pair<Browser*, int> GetBrowserAndTabForDisposition(
@@ -313,6 +313,10 @@ std::pair<Browser*, int> GetBrowserAndTabForDisposition(
: 1.0;
browser_params.pip_options = pip_options;
@ -542,7 +556,7 @@ index 151c73f9d7a18..e02316efd4011 100644
const BrowserWindow* const browser_window = params.browser->window();
const gfx::NativeWindow native_window =
browser_window ? browser_window->GetNativeWindow()
@@ -590,6 +594,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -598,6 +602,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);