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 133.0.6943.0 (#1402768)

Browse Source
This commit is contained in:
Marshall Greenblatt
2025-01-08 14:03:13 -05:00
parent 7588c9dcbf
commit 7be2558291
74 changed files with 694 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
patch/patches/chrome_browser_browser.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
index 2480282a19d12..dbd1fbf8a15b5 100644
index 7603c2662b8dc..9a38d816bdc40 100644
--- chrome/browser/browser_about_handler.cc
+++ chrome/browser/browser_about_handler.cc
@@ -72,6 +72,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
@@ -69,6 +69,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
FROM_HERE, base::BindOnce(&chrome::AttemptExit));
return true;
}
@@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
index 4aaba212926f4..e8aadb2c97fe9 100644
index 964c47b090cb1..1917dc314c3ae 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -38,6 +38,7 @@
@@ -24,7 +24,7 @@ index 4aaba212926f4..e8aadb2c97fe9 100644
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
@@ -1221,6 +1222,13 @@ DevToolsWindow* DevToolsWindow::Create(
@@ -1220,6 +1221,13 @@ DevToolsWindow* DevToolsWindow::Create(
!browser->is_type_normal()) {
can_dock = false;
}
@@ -38,7 +38,7 @@ index 4aaba212926f4..e8aadb2c97fe9 100644
}
// Create WebContents with devtools.
@@ -1680,9 +1688,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
@@ -1679,9 +1687,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
if (!inspected_web_contents ||
!inspected_web_contents->OpenURL(params,
/*navigation_handle_callback=*/{})) {
@@ -52,7 +52,7 @@ index 4aaba212926f4..e8aadb2c97fe9 100644
}
}
@@ -1845,12 +1857,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
@@ -1844,12 +1856,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
Browser::CreationStatus::kOk) {
return;
}
@@ -88,7 +88,7 @@ index 4aaba212926f4..e8aadb2c97fe9 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 977b3222c8f7c..e5d36a4e5921e 100644
index c8b65faa2d65b..687f4cff4ea64 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
@@ -99,7 +99,7 @@ index 977b3222c8f7c..e5d36a4e5921e 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -303,6 +304,10 @@ static_library("ui") {
@@ -301,6 +302,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -110,7 +110,7 @@ index 977b3222c8f7c..e5d36a4e5921e 100644
public_deps = [
# WARNING WARNING WARNING
# New dependencies outside of //chrome/browser should be added to
@@ -331,6 +336,7 @@ static_library("ui") {
@@ -329,6 +334,7 @@ static_library("ui") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/linux/dbus:buildflags",
"//cc/paint",
@@ -118,7 +118,7 @@ index 977b3222c8f7c..e5d36a4e5921e 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -699,6 +705,13 @@ static_library("ui") {
@@ -696,6 +702,13 @@ static_library("ui") {
deps += [ "//components/plus_addresses/resources:vector_icons" ]
}
@@ -132,7 +132,7 @@ index 977b3222c8f7c..e5d36a4e5921e 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.
@@ -5487,6 +5500,7 @@ static_library("ui") {
@@ -5441,6 +5454,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@@ -141,10 +141,10 @@ index 977b3222c8f7c..e5d36a4e5921e 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index a62c82aab7a35..cbd8c87aba959 100644
index e0582db3e8e88..1c61a24136933 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -269,6 +269,25 @@
@@ -270,6 +270,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@@ -170,7 +170,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -558,6 +577,10 @@ Browser::Browser(const CreateParams& params)
@@ -565,6 +584,10 @@ Browser::Browser(const CreateParams& params)
type_(params.type),
profile_(params.profile),
window_(nullptr),
@@ -181,10 +181,10 @@ index a62c82aab7a35..cbd8c87aba959 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -788,6 +811,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
@@ -802,6 +825,12 @@ Browser::~Browser() {
if (select_file_dialog_.get()) {
select_file_dialog_->ListenerDestroyed();
}
+
+ // Clean up any objects attached via UserData before implicit destruction
+ // of CreateParams. Destruction of those objects may call into something
@@ -194,7 +194,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1407,6 +1436,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1409,6 +1438,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@@ -203,9 +203,9 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1726,6 +1757,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
@@ -1742,6 +1773,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
return content::KeyboardEventProcessingResult::HANDLED;
}
+#if BUILDFLAG(ENABLE_CEF)
+ if (cef_browser_delegate_) {
@@ -218,7 +218,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1733,8 +1772,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1749,8 +1788,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -239,10 +239,10 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1826,9 +1875,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) {
@@ -1845,9 +1894,14 @@ bool Browser::IsBackForwardCacheSupported(content::WebContents& web_contents) {
content::PreloadingEligibility Browser::IsPrerender2Supported(
content::WebContents& web_contents) {
content::WebContents& web_contents,
content::PreloadingTriggerType trigger_type) {
+#if BUILDFLAG(ENABLE_CEF)
+ // Prerender is not supported in CEF. See issue #3664.
+ return content::PreloadingEligibility::kPreloadingDisabled;
@@ -254,7 +254,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
bool Browser::ShouldShowStaleContentOnEviction(content::WebContents* source) {
@@ -1888,6 +1942,14 @@ WebContents* Browser::OpenURLFromTab(
@@ -1910,6 +1964,14 @@ WebContents* Browser::OpenURLFromTab(
std::move(navigation_handle_callback));
}
@@ -269,7 +269,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -2054,6 +2116,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -2083,6 +2145,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -278,17 +278,17 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -2082,6 +2146,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -2112,6 +2176,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
+ CALL_CEF_DELEGATE(UpdateTargetURL, source, url);
+
if (!GetStatusBubble())
if (!GetStatusBubble()) {
return;
@@ -2089,6 +2155,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -2121,6 +2187,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
}
}
+bool Browser::DidAddMessageToConsole(
@@ -305,7 +305,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::EventType::kMouseExited;
@@ -2117,6 +2194,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -2149,6 +2226,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@@ -325,10 +325,10 @@ index a62c82aab7a35..cbd8c87aba959 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2213,12 +2303,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// will later be inserted into this browser using Browser::Navigate via
// AddNewContents.
TabHelpers::AttachTabHelpers(new_contents);
@@ -2261,12 +2351,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);
+
+ CALL_CEF_DELEGATE(WebContentsCreated, source_contents,
+ opener_render_process_id, opener_render_frame_id,
@@ -343,34 +343,34 @@ index a62c82aab7a35..cbd8c87aba959 100644
+ if (cef_browser_delegate_ &&
+ cef_browser_delegate_->RendererUnresponsiveEx(source, render_widget_host,
+ hang_monitor_restarter)) {
+ return;
+ return;
+ }
+#endif
+
// 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();
@@ -2231,6 +2333,13 @@ void Browser::RendererUnresponsive(
@@ -2279,6 +2381,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
+#if BUILDFLAG(ENABLE_CEF)
+ if (cef_browser_delegate_ &&
+ cef_browser_delegate_->RendererResponsiveEx(source, render_widget_host)) {
+ return;
+ return;
+ }
+#endif
+
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2240,6 +2349,15 @@ void Browser::RendererResponsive(
@@ -2288,6 +2397,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
+#if BUILDFLAG(ENABLE_CEF)
+ if (cef_browser_delegate_) {
+ auto* cef_js_dialog_manager =
+ auto* cef_js_dialog_manager =
+ cef_browser_delegate_->GetJavaScriptDialogManager(source);
+ if (cef_js_dialog_manager) {
+ return cef_js_dialog_manager;
@@ -380,7 +380,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2275,6 +2393,11 @@ void Browser::DraggableRegionsChanged(
@@ -2323,6 +2441,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@@ -392,7 +392,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
void Browser::DidFinishNavigation(
@@ -2355,11 +2478,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2405,11 +2528,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 a62c82aab7a35..cbd8c87aba959 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2562,6 +2689,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2619,6 +2746,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@@ -424,7 +424,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -3114,9 +3250,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -3187,9 +3323,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@@ -436,7 +436,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -3124,6 +3261,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -3197,6 +3334,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 a62c82aab7a35..cbd8c87aba959 100644
return nullptr;
}
@@ -3269,6 +3412,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3346,6 +3489,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 a62c82aab7a35..cbd8c87aba959 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3426,6 +3571,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3506,6 +3651,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@@ -474,7 +474,7 @@ index a62c82aab7a35..cbd8c87aba959 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 1455dcab97edb..eb86532470a75 100644
index 0ee8fee2166f0..cdbf89ce7088b 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -25,6 +25,7 @@
@@ -539,7 +539,7 @@ index 1455dcab97edb..eb86532470a75 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -964,10 +991,18 @@ class Browser : public TabStripModelObserver,
@@ -962,10 +989,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,7 +558,7 @@ index 1455dcab97edb..eb86532470a75 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1306,6 +1341,10 @@ class Browser : public TabStripModelObserver,
@@ -1303,6 +1338,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@@ -569,7 +569,7 @@ index 1455dcab97edb..eb86532470a75 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1372,6 +1411,8 @@ class Browser : public TabStripModelObserver,
@@ -1369,6 +1408,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@@ -579,7 +579,7 @@ index 1455dcab97edb..eb86532470a75 100644
UnloadController unload_controller_;
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index d26f6e2bdefd8..6c37714cc328f 100644
index 819c44848e6ab..8e233a8b2d420 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -260,6 +260,10 @@ std::tuple<Browser*, int> GetBrowserAndTabForDisposition(
@@ -613,7 +613,7 @@ index d26f6e2bdefd8..6c37714cc328f 100644
bool IsHostAllowedInIncognito(const GURL& url) {
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
index 1f84235515463..82942fb06b5f3 100644
index f12ba73369a65..23c43dcb1dd24 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 1f84235515463..82942fb06b5f3 100644
params.disposition = foreground ? WindowOpenDisposition::NEW_FOREGROUND_TAB
: WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.tabstrip_index = idx;
@@ -84,6 +88,16 @@ content::WebContents* AddWebContents(
@@ -85,6 +89,16 @@ content::WebContents* AddWebContents(
// Can't create a new contents for the current tab - invalid case.
DCHECK(disposition != WindowOpenDisposition::CURRENT_TAB);