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 128.0.6613.0 (#1331488)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-07-29 13:09:20 -04:00
parent a6c00b2ff6
commit 446b7d6535
96 changed files with 798 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
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 02ff1e580d3a7..e2e232c424029 100644
index 4acc7a7a3998c..d80104e8f5aa3 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -37,6 +37,7 @@
@@ -38,6 +38,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 02ff1e580d3a7..e2e232c424029 100644
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
@@ -1234,6 +1235,13 @@ DevToolsWindow* DevToolsWindow::Create(
@@ -1211,6 +1212,13 @@ DevToolsWindow* DevToolsWindow::Create(
!browser->is_type_normal()) {
can_dock = false;
}
@@ -38,7 +38,7 @@ index 02ff1e580d3a7..e2e232c424029 100644
}
// Create WebContents with devtools.
@@ -1754,9 +1762,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
@@ -1674,9 +1682,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
if (!inspected_web_contents ||
!inspected_web_contents->OpenURL(params,
/*navigation_handle_callback=*/{})) {
@@ -52,7 +52,7 @@ index 02ff1e580d3a7..e2e232c424029 100644
}
}
@@ -1919,12 +1931,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
@@ -1839,12 +1851,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
Browser::CreationStatus::kOk) {
return;
}
@@ -88,7 +88,7 @@ index 02ff1e580d3a7..e2e232c424029 100644
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 74460ac479210..c484be466eefb 100644
index c54ec37e56ad7..fda899ec278ef 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 74460ac479210..c484be466eefb 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -412,6 +413,10 @@ static_library("ui") {
@@ -417,6 +418,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@@ -107,10 +107,10 @@ index 74460ac479210..c484be466eefb 100644
+ configs += [ "//cef/libcef/features:config" ]
+ }
+
# 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
@@ -439,6 +444,7 @@ static_library("ui") {
public_deps = [
# WARNING WARNING WARNING
# New dependencies outside of //chrome/browser should be added to
@@ -438,6 +443,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@@ -118,7 +118,7 @@ index 74460ac479210..c484be466eefb 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -759,6 +765,10 @@ static_library("ui") {
@@ -739,6 +745,10 @@ static_library("ui") {
deps += [ "//components/plus_addresses/resources:vector_icons" ]
}
@@ -127,9 +127,17 @@ index 74460ac479210..c484be466eefb 100644
+ }
+
# TODO(crbug.com/41437292): Remove this circular dependency.
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
allow_circular_includes_from = [
# TODO(crbug.com/40161499): Remove this circular dependency.
@@ -3040,6 +3050,8 @@ static_library("ui") {
@@ -1540,7 +1550,6 @@ static_library("ui") {
"tabs/tab_menu_model_factory.h",
"tabs/tab_model.cc",
"tabs/tab_model.h",
- "tabs/tab_network_state.cc",
"tabs/tab_network_state.h",
"tabs/tab_renderer_data.cc",
"tabs/tab_renderer_data.h",
@@ -2323,6 +2332,8 @@ static_library("ui") {
"views/apps/app_dialog/app_local_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@@ -138,16 +146,16 @@ index 74460ac479210..c484be466eefb 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",
@@ -4249,8 +4261,6 @@ static_library("ui") {
@@ -3875,8 +3886,6 @@ static_library("ui") {
"autofill/payments/webauthn_dialog_model.h",
"autofill/payments/webauthn_dialog_model_observer.h",
"autofill/payments/webauthn_dialog_state.h",
- "frame/window_frame_util.cc",
- "frame/window_frame_util.h",
"incognito_clear_browsing_data_dialog_interface.h",
"signin/signin_modal_dialog.cc",
"signin/signin_modal_dialog.h",
@@ -5125,8 +5135,6 @@ static_library("ui") {
"passwords/password_cross_domain_confirmation_popup_controller_impl.cc",
"passwords/password_cross_domain_confirmation_popup_controller_impl.h",
@@ -4758,8 +4767,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",
@@ -156,7 +164,7 @@ index 74460ac479210..c484be466eefb 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",
@@ -6908,6 +6916,7 @@ static_library("ui") {
@@ -6578,6 +6585,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@@ -165,10 +173,10 @@ index 74460ac479210..c484be466eefb 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 557abfcd71d85..fb64e93157148 100644
index 681fe10f28260..89da7d87b306b 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -272,6 +272,25 @@
@@ -271,6 +271,25 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif
@@ -194,7 +202,7 @@ index 557abfcd71d85..fb64e93157148 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -537,6 +556,10 @@ Browser::Browser(const CreateParams& params)
@@ -536,6 +555,10 @@ Browser::Browser(const CreateParams& params)
type_(params.type),
profile_(params.profile),
window_(nullptr),
@@ -205,7 +213,7 @@ index 557abfcd71d85..fb64e93157148 100644
tab_strip_model_delegate_(
std::make_unique<chrome::BrowserTabStripModelDelegate>(this)),
tab_strip_model_(std::make_unique<TabStripModel>(
@@ -757,6 +780,12 @@ Browser::~Browser() {
@@ -769,6 +792,12 @@ Browser::~Browser() {
// away so they don't try and call back to us.
if (select_file_dialog_.get())
select_file_dialog_->ListenerDestroyed();
@@ -218,7 +226,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1217,6 +1246,8 @@ void Browser::WindowFullscreenStateChanged() {
@@ -1242,6 +1271,8 @@ void Browser::WindowFullscreenStateChanged() {
->WindowFullscreenStateChanged();
command_controller_->FullscreenStateChanged();
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
@@ -227,7 +235,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
void Browser::FullscreenTopUIStateChanged() {
@@ -1584,6 +1615,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1615,6 +1646,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -242,7 +250,7 @@ index 557abfcd71d85..fb64e93157148 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1591,8 +1630,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1622,8 +1661,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -263,7 +271,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
bool Browser::TabsNeedBeforeUnloadFired() const {
@@ -1768,6 +1817,16 @@ WebContents* Browser::OpenURLFromTab(
@@ -1785,6 +1834,16 @@ WebContents* Browser::OpenURLFromTab(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -280,7 +288,7 @@ index 557abfcd71d85..fb64e93157148 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1930,6 +1989,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1947,6 +2006,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -289,7 +297,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1958,6 +2019,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1975,6 +2036,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -298,7 +306,7 @@ index 557abfcd71d85..fb64e93157148 100644
if (!GetStatusBubble())
return;
@@ -1965,6 +2028,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1982,6 +2045,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -315,8 +323,8 @@ index 557abfcd71d85..fb64e93157148 100644
+
void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) {
const ui::EventType type = event.type();
const bool exited = type == ui::ET_MOUSE_EXITED;
@@ -1992,6 +2066,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
const bool exited = type == ui::EventType::kMouseExited;
@@ -2010,6 +2084,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@@ -336,7 +344,7 @@ index 557abfcd71d85..fb64e93157148 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -2091,12 +2178,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -2109,12 +2196,24 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -361,7 +369,7 @@ index 557abfcd71d85..fb64e93157148 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();
@@ -2109,6 +2208,13 @@ void Browser::RendererUnresponsive(
@@ -2127,6 +2226,13 @@ void Browser::RendererUnresponsive(
void Browser::RendererResponsive(
WebContents* source,
content::RenderWidgetHost* render_widget_host) {
@@ -375,7 +383,7 @@ index 557abfcd71d85..fb64e93157148 100644
RenderWidgetHostView* view = render_widget_host->GetView();
if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) {
TabDialogs::FromWebContents(source)->HideHungRendererDialog(
@@ -2118,6 +2224,15 @@ void Browser::RendererResponsive(
@@ -2136,6 +2242,15 @@ void Browser::RendererResponsive(
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
WebContents* source) {
@@ -391,7 +399,7 @@ index 557abfcd71d85..fb64e93157148 100644
return javascript_dialogs::TabModalDialogManager::FromWebContents(source);
}
@@ -2153,6 +2268,11 @@ void Browser::DraggableRegionsChanged(
@@ -2171,6 +2286,11 @@ void Browser::DraggableRegionsChanged(
if (app_controller_) {
app_controller_->DraggableRegionsChanged(regions, contents);
}
@@ -403,7 +411,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
void Browser::DidFinishNavigation(
@@ -2233,11 +2353,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2251,11 +2371,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@@ -419,7 +427,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2437,6 +2561,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2456,6 +2580,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@@ -435,7 +443,7 @@ index 557abfcd71d85..fb64e93157148 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2981,9 +3114,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2998,9 +3131,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@@ -448,7 +456,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
// We hide the status bar for web apps windows as this matches native
@@ -2991,6 +3126,12 @@ StatusBubble* Browser::GetStatusBubble() {
@@ -3008,6 +3143,12 @@ StatusBubble* Browser::GetStatusBubble() {
// mode, as the minimal browser UI includes the status bar.
if (web_app::AppBrowserController::IsWebApp(this) &&
!app_controller()->HasMinimalUiButtons()) {
@@ -461,7 +469,7 @@ index 557abfcd71d85..fb64e93157148 100644
return nullptr;
}
@@ -3140,6 +3281,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -3157,6 +3298,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@@ -470,7 +478,7 @@ index 557abfcd71d85..fb64e93157148 100644
}
void Browser::TabDetachedAtImpl(content::WebContents* contents,
@@ -3294,6 +3437,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
@@ -3311,6 +3454,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature(
bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
bool check_can_support) const {
@@ -486,10 +494,10 @@ index 557abfcd71d85..fb64e93157148 100644
case TYPE_NORMAL:
return NormalBrowserSupportsWindowFeature(feature, check_can_support);
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 69f2c9c0ff003..83d46c6326568 100644
index cbc5ae1c02941..f0200afb918c1 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@@ -24,6 +24,7 @@
#include "base/timer/elapsed_timer.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -497,7 +505,7 @@ index 69f2c9c0ff003..83d46c6326568 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"
@@ -51,6 +52,10 @@
@@ -53,6 +54,10 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/shell_dialogs/select_file_dialog.h"
@@ -508,7 +516,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
#if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -370,6 +375,15 @@ class Browser : public TabStripModelObserver,
@@ -376,6 +381,15 @@ class Browser : public TabStripModelObserver,
// Document Picture in Picture options, specific to TYPE_PICTURE_IN_PICTURE.
std::optional<blink::mojom::PictureInPictureWindowOptions> pip_options;
@@ -524,7 +532,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -451,6 +465,13 @@ class Browser : public TabStripModelObserver,
@@ -457,6 +471,13 @@ class Browser : public TabStripModelObserver,
update_ui_immediately_for_testing_ = true;
}
@@ -538,7 +546,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -546,6 +567,12 @@ class Browser : public TabStripModelObserver,
@@ -552,6 +573,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
base::WeakPtr<const Browser> AsWeakPtr() const;
@@ -551,7 +559,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -959,10 +986,18 @@ class Browser : public TabStripModelObserver,
@@ -963,10 +990,18 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -570,7 +578,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1297,6 +1332,10 @@ class Browser : public TabStripModelObserver,
@@ -1294,6 +1329,10 @@ class Browser : public TabStripModelObserver,
// This Browser's window.
raw_ptr<BrowserWindow, DanglingUntriaged> window_;
@@ -581,7 +589,7 @@ index 69f2c9c0ff003..83d46c6326568 100644
std::unique_ptr<TabStripModelDelegate> const tab_strip_model_delegate_;
std::unique_ptr<TabStripModel> const tab_strip_model_;
@@ -1363,6 +1402,8 @@ class Browser : public TabStripModelObserver,
@@ -1360,6 +1399,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@@ -591,11 +599,11 @@ index 69f2c9c0ff003..83d46c6326568 100644
UnloadController unload_controller_;
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index ec2ca0cefeb4a..66b480f50f72d 100644
index 1e4d7bc3a4c0a..9ac5f645e4591 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -313,6 +313,10 @@ std::pair<Browser*, int> GetBrowserAndTabForDisposition(
: 1.0;
@@ -311,6 +311,10 @@ std::pair<Browser*, int> GetBrowserAndTabForDisposition(
browser_params.pip_options = pip_options;
+#if BUILDFLAG(ENABLE_CEF)
@@ -605,7 +613,7 @@ index ec2ca0cefeb4a..66b480f50f72d 100644
const BrowserWindow* const browser_window = params.browser->window();
const gfx::NativeWindow native_window =
browser_window ? browser_window->GetNativeWindow()
@@ -598,6 +602,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -599,6 +603,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);