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 120.0.6099.56

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-11-30 14:45:56 +00:00
committed by Marshall Greenblatt
parent 7edfbed283
commit e153def017
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/120.0.6099.35', 'chromium_checkout': 'refs/tags/120.0.6099.56',
'depot_tools_checkout': 'f01ca5848d' 'depot_tools_checkout': 'f01ca5848d'
} }

4
patch/patches/chrome_browser_profiles.patch
View File

@ -84,10 +84,10 @@ index 52eb459e9deba..11a92e9e5cfdc 100644
// Returns whether the user has signed in this profile to an account. // Returns whether the user has signed in this profile to an account.
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index d397943b6fc9f..4b381fd2e27f4 100644 index 52a5f08810e85..ce21b2ea52f06 100644
--- chrome/browser/profiles/profile_impl.cc --- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc
@@ -1031,7 +1031,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -1034,7 +1034,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile); otr_profiles_[otr_profile_id] = std::move(otr_profile);

6
patch/patches/chrome_runtime.patch
View File

@ -490,7 +490,7 @@ index 7c47a56574e7a..390c47f95f725 100644
#endif #endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 1e7a865273e07..d5c8889ee79d7 100644 index 0af94fd3059cf..a634aa982ce4c 100644
--- chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
@ -522,7 +522,7 @@ index 1e7a865273e07..d5c8889ee79d7 100644
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry); DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif #endif
@@ -1618,6 +1625,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { @@ -1627,6 +1634,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last. // This is intentionally last.
RegisterLocalStatePrefsForMigration(registry); RegisterLocalStatePrefsForMigration(registry);
@ -534,7 +534,7 @@ index 1e7a865273e07..d5c8889ee79d7 100644
} }
// Register prefs applicable to all profiles. // Register prefs applicable to all profiles.
@@ -2046,6 +2058,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -2055,6 +2067,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) { const std::string& locale) {
RegisterProfilePrefs(registry, locale); RegisterProfilePrefs(registry, locale);

24
patch/patches/chrome_runtime_views.patch
View File

@ -41,10 +41,10 @@ index 7d57988659286..576550dd75111 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const { bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
index dae8cfd98ef49..2c96c0634b6a0 100644 index fb4f948c933de..9c594108e619d 100644
--- chrome/browser/ui/toolbar/app_menu_model.cc --- chrome/browser/ui/toolbar/app_menu_model.cc
+++ chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -593,6 +593,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( @@ -594,6 +594,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
} }
} }
@ -102,7 +102,7 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
} // namespace } // namespace
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@@ -1397,7 +1448,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { @@ -1442,7 +1493,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
return false; return false;
} }
@ -111,7 +111,7 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
GlobalError* error = GlobalError* error =
GlobalErrorServiceFactory::GetForProfile(browser_->profile()) GlobalErrorServiceFactory::GetForProfile(browser_->profile())
->GetGlobalErrorByMenuItemCommandID(command_id); ->GetGlobalErrorByMenuItemCommandID(command_id);
@@ -1412,6 +1463,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { @@ -1457,6 +1508,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
} }
} }
@ -142,7 +142,7 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
bool AppMenuModel::IsCommandIdAlerted(int command_id) const { bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
if (command_id == IDC_VIEW_PASSWORDS || if (command_id == IDC_VIEW_PASSWORDS ||
command_id == IDC_SHOW_PASSWORD_MANAGER) { command_id == IDC_SHOW_PASSWORD_MANAGER) {
@@ -1593,11 +1668,15 @@ void AppMenuModel::Build() { @@ -1650,11 +1725,15 @@ void AppMenuModel::Build() {
kDefaultIconSize)); kDefaultIconSize));
} }
@ -163,7 +163,7 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
AddItemWithStringId(IDC_PRINT, IDS_PRINT); AddItemWithStringId(IDC_PRINT, IDS_PRINT);
@@ -1686,9 +1765,13 @@ void AppMenuModel::Build() { @@ -1743,9 +1822,13 @@ void AppMenuModel::Build() {
kMoreToolsMenuItem); kMoreToolsMenuItem);
if (!features::IsChromeRefresh2023()) { if (!features::IsChromeRefresh2023()) {
@ -180,7 +180,7 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
} }
if (!features::IsChromeRefresh2023()) { if (!features::IsChromeRefresh2023()) {
@@ -1775,6 +1858,11 @@ void AppMenuModel::Build() { @@ -1832,6 +1915,11 @@ void AppMenuModel::Build() {
SetCommandIcon(this, IDC_EXIT, kExitMenuIcon); SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
} }
@ -193,10 +193,10 @@ index dae8cfd98ef49..2c96c0634b6a0 100644
} }
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
index c942243e8a63f..278a0bdc89856 100644 index 3a9d1508b6a5f..96aacadaaabbd 100644
--- chrome/browser/ui/toolbar/app_menu_model.h --- chrome/browser/ui/toolbar/app_menu_model.h
+++ chrome/browser/ui/toolbar/app_menu_model.h +++ chrome/browser/ui/toolbar/app_menu_model.h
@@ -209,6 +209,7 @@ class AppMenuModel : public ui::SimpleMenuModel, @@ -214,6 +214,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
void ExecuteCommand(int command_id, int event_flags) override; void ExecuteCommand(int command_id, int event_flags) override;
bool IsCommandIdChecked(int command_id) const override; bool IsCommandIdChecked(int command_id) const override;
bool IsCommandIdEnabled(int command_id) const override; bool IsCommandIdEnabled(int command_id) const override;
@ -204,9 +204,9 @@ index c942243e8a63f..278a0bdc89856 100644
bool IsCommandIdAlerted(int command_id) const override; bool IsCommandIdAlerted(int command_id) const override;
bool IsElementIdAlerted(ui::ElementIdentifier element_id) const override; bool IsElementIdAlerted(ui::ElementIdentifier element_id) const override;
bool GetAcceleratorForCommandId(int command_id, bool GetAcceleratorForCommandId(int command_id,
@@ -242,6 +243,8 @@ class AppMenuModel : public ui::SimpleMenuModel, @@ -255,6 +256,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
// took to select the command. absl::optional<safety_hub::SafetyHubModuleType> expected_module =
void LogMenuMetrics(int command_id); absl::nullopt);
+ bool IsCommandIdEnabledInternal(int command_id) const; + bool IsCommandIdEnabledInternal(int command_id) const;
+ +

8
patch/patches/linux_printing_context.patch
View File

@ -1,8 +1,8 @@
diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc
index 2bb8fbf922692..288ec4fd4ef7f 100644 index 49f0ddab8318e..a3a9cd189fc2f 100644
--- printing/printing_context_linux.cc --- printing/printing_context_linux.cc
+++ printing/printing_context_linux.cc +++ printing/printing_context_linux.cc
@@ -73,11 +73,11 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() { @@ -69,11 +69,11 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
ResetSettings(); ResetSettings();
#if BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX)
@ -16,7 +16,7 @@ index 2bb8fbf922692..288ec4fd4ef7f 100644
if (print_dialog_) { if (print_dialog_) {
print_dialog_->UseDefaultSettings(); print_dialog_->UseDefaultSettings();
@@ -89,8 +89,8 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() { @@ -85,8 +85,8 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSettings() {
gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
#if BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX)
@ -27,7 +27,7 @@ index 2bb8fbf922692..288ec4fd4ef7f 100644
#endif #endif
return gfx::Size(); return gfx::Size();
@@ -102,11 +102,11 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings( @@ -98,11 +98,11 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterSettings(
DCHECK(!in_print_job_); DCHECK(!in_print_job_);
#if BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX)

4
patch/patches/net_cookie_flags.patch
View File

@ -10,10 +10,10 @@ index 17b1395583e24..9b41b21f42b1f 100644
+// This load will not send any cookies. For CEF usage. +// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20) +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index fee80f24bbd37..828908071f210 100644 index fcb821c562aa1..a05b8169b905d 100644
--- net/url_request/url_request_http_job.cc --- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc
@@ -1856,7 +1856,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { @@ -1819,7 +1819,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode // Read cookies whenever allow_credentials() is true, even if the PrivacyMode
// is being overridden by NetworkDelegate and will eventually block them, as // is being overridden by NetworkDelegate and will eventually block them, as
// blocked cookies still need to be logged in that case. // blocked cookies still need to be logged in that case.

6
patch/patches/print_preview_123.patch
View File

@ -84,7 +84,7 @@ index c85248ab0d0a0..05b3454c0356d 100644
} }
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index f1a9d46a70ffb..2cf6c5aefa1c7 100644 index e13101506295d..4acd84f6c150f 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
@ -95,7 +95,7 @@ index f1a9d46a70ffb..2cf6c5aefa1c7 100644
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/browser_management/management_service_factory.h" #include "chrome/browser/enterprise/browser_management/management_service_factory.h"
#include "chrome/browser/pdf/pdf_extension_util.h" #include "chrome/browser/pdf/pdf_extension_util.h"
@@ -107,6 +108,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)"; @@ -108,6 +109,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)"; const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
#endif #endif
@ -109,7 +109,7 @@ index f1a9d46a70ffb..2cf6c5aefa1c7 100644
constexpr char kInvalidArgsForDidStartPreview[] = constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview"; "Invalid arguments for DidStartPreview";
constexpr char kInvalidPageIndexForDidPreviewPage[] = constexpr char kInvalidPageIndexForDidPreviewPage[] =
@@ -300,7 +308,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) { @@ -301,7 +309,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedStrings(kLocalizedStrings); source->AddLocalizedStrings(kLocalizedStrings);
#if !BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS)

16
patch/patches/printing_context_2196.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 9fefdc150acf8..6c16766e89584 100644 index 57de2cf6fe6a6..0aea741afe2de 100644
--- chrome/browser/printing/printer_query.cc --- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc +++ chrome/browser/printing/printer_query.cc
@@ -123,6 +123,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id) @@ -124,6 +124,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
rfh_id_(rfh_id), rfh_id_(rfh_id),
cookie_(PrintSettings::NewCookie()) { cookie_(PrintSettings::NewCookie()) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -11,10 +11,10 @@ index 9fefdc150acf8..6c16766e89584 100644
PrinterQuery::~PrinterQuery() { PrinterQuery::~PrinterQuery() {
diff --git printing/printing_context.h printing/printing_context.h diff --git printing/printing_context.h printing/printing_context.h
index c753f04d8b73a..7607571f78119 100644 index 6db58a9992642..ac57e5c200079 100644
--- printing/printing_context.h --- printing/printing_context.h
+++ printing/printing_context.h +++ printing/printing_context.h
@@ -176,6 +176,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { @@ -204,6 +204,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; } int job_id() const { return job_id_; }
@ -26,9 +26,9 @@ index c753f04d8b73a..7607571f78119 100644
+ int render_frame_id() const { return render_frame_id_; } + int render_frame_id() const { return render_frame_id_; }
+ +
protected: protected:
explicit PrintingContext(Delegate* delegate); PrintingContext(Delegate* delegate, ProcessBehavior process_behavior);
@@ -220,6 +227,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { @@ -234,6 +241,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active. // The job id for the current job. The value is 0 if no jobs are active.
int job_id_; int job_id_;
@ -37,5 +37,5 @@ index c753f04d8b73a..7607571f78119 100644
+ int render_frame_id_ = 0; + int render_frame_id_ = 0;
+ +
private: private:
#if BUILDFLAG(ENABLE_OOP_PRINTING) const ProcessBehavior process_behavior_;
// If this instance of PrintingContext should skip making any system calls };

4
patch/patches/rfh_navigation_4829483.patch
View File

@ -12,10 +12,10 @@ index 5cb6e6463767d..84a9de1dfc6f0 100644
RenderFrameHostImpl::FromFrameToken( RenderFrameHostImpl::FromFrameToken(
process_id, initiator_frame_token->value())) { process_id, initiator_frame_token->value())) {
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index fe69db83393ef..839f002fef986 100644 index c1a712883d4b5..634d86382e73a 100644
--- content/browser/renderer_host/render_frame_host_impl.cc --- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -10210,6 +10210,7 @@ void RenderFrameHostImpl::CommitNavigation( @@ -10211,6 +10211,7 @@ void RenderFrameHostImpl::CommitNavigation(
auto browser_calc_origin_to_commit = auto browser_calc_origin_to_commit =
navigation_request->GetOriginToCommitWithDebugInfo(); navigation_request->GetOriginToCommitWithDebugInfo();
if (!process_lock.is_error_page() && !is_mhtml_subframe && if (!process_lock.is_error_page() && !is_mhtml_subframe &&