Skip to content

Commit 446b7d6

Browse files
committed
Update to Chromium version 128.0.6613.0 (#1331488)
1 parent a6c00b2 commit 446b7d6

File tree

96 files changed

+798
-877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+798
-877
lines changed

BUILD.gn

+29-46
Original file line numberDiff line numberDiff line change
@@ -1328,8 +1328,9 @@ make_pack_header("strings") {
13281328
"$root_gen_dir/components/strings/grit/components_strings.h",
13291329
"$root_gen_dir/extensions/strings/grit/extensions_strings.h",
13301330
"$root_gen_dir/services/strings/grit/services_strings.h",
1331-
"$root_gen_dir/third_party/blink/public/strings/grit/blink_accessibility_strings.h",
13321331
"$root_gen_dir/third_party/blink/public/strings/grit/blink_strings.h",
1332+
"$root_gen_dir/ui/strings/grit/app_locale_settings.h",
1333+
"$root_gen_dir/ui/strings/grit/auto_image_annotation_strings.h",
13331334
"$root_gen_dir/ui/strings/grit/ui_strings.h",
13341335
]
13351336

@@ -1346,8 +1347,8 @@ make_pack_header("strings") {
13461347
"//extensions/strings",
13471348
"//services/strings",
13481349
"//third_party/blink/public/strings",
1349-
"//third_party/blink/public/strings:accessibility_strings",
13501350
"//ui/strings:app_locale_settings",
1351+
"//ui/strings:auto_image_annotation_strings",
13511352
"//ui/strings:ui_strings",
13521353
]
13531354
}
@@ -1471,50 +1472,32 @@ if (is_mac) {
14711472
]
14721473
}
14731474

1474-
if (use_egl) {
1475-
# Add the ANGLE .dylibs in the MODULE_DIR of the Framework app bundle.
1476-
bundle_data("cef_framework_angle_binaries") {
1477-
sources = [
1478-
"$root_out_dir/egl_intermediates/libEGL.dylib",
1479-
"$root_out_dir/egl_intermediates/libGLESv2.dylib",
1480-
]
1481-
outputs = [
1482-
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
1483-
]
1484-
public_deps = [
1485-
"//ui/gl:angle_library_copy",
1486-
]
1487-
}
1488-
1489-
# Add the SwiftShader .dylibs in the MODULE_DIR of the Framework app bundle.
1490-
bundle_data("cef_framework_swiftshader_binaries") {
1491-
sources = [
1492-
"$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
1493-
"$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
1494-
]
1495-
outputs = [
1496-
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
1497-
]
1498-
public_deps = [
1499-
"//ui/gl:swiftshader_vk_library_copy",
1500-
]
1501-
}
1502-
}
1503-
1504-
group("cef_framework_angle_library") {
1505-
if (use_egl) {
1506-
deps = [
1507-
":cef_framework_angle_binaries",
1508-
]
1509-
}
1475+
# Add the ANGLE .dylibs in the MODULE_DIR of the Framework app bundle.
1476+
bundle_data("cef_framework_angle_binaries") {
1477+
sources = [
1478+
"$root_out_dir/egl_intermediates/libEGL.dylib",
1479+
"$root_out_dir/egl_intermediates/libGLESv2.dylib",
1480+
]
1481+
outputs = [
1482+
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
1483+
]
1484+
public_deps = [
1485+
"//ui/gl:angle_library_copy",
1486+
]
15101487
}
15111488

1512-
group("cef_framework_swiftshader_library") {
1513-
if (use_egl) {
1514-
deps = [
1515-
":cef_framework_swiftshader_binaries",
1516-
]
1517-
}
1489+
# Add the SwiftShader .dylibs in the MODULE_DIR of the Framework app bundle.
1490+
bundle_data("cef_framework_swiftshader_binaries") {
1491+
sources = [
1492+
"$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
1493+
"$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
1494+
]
1495+
outputs = [
1496+
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",
1497+
]
1498+
public_deps = [
1499+
"//ui/gl:swiftshader_vk_library_copy",
1500+
]
15181501
}
15191502

15201503
mac_framework_bundle("cef_framework") {
@@ -1538,9 +1521,9 @@ if (is_mac) {
15381521
gypi_paths.autogen_library_side
15391522

15401523
deps = [
1541-
":cef_framework_angle_library",
1524+
":cef_framework_angle_binaries",
15421525
":cef_framework_resources",
1543-
":cef_framework_swiftshader_library",
1526+
":cef_framework_swiftshader_binaries",
15441527
":libcef_static",
15451528
":libcef_test_support",
15461529
]

CHROMIUM_BUILD_COMPATIBILITY.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
88

99
{
10-
'chromium_checkout': 'refs/tags/127.0.6533.0'
10+
'chromium_checkout': 'refs/tags/128.0.6613.0'
1111
}

CHROMIUM_UPDATE.txt

-11
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,6 @@
2727
# Files in the chromium/src directory that should be evaluated for changes.
2828
# Similar changes may need to be applied to the CEF source code.
2929
'files': [
30-
'chrome/browser/browser_process.h',
31-
'chrome/browser/extensions/api/tabs/tabs_api.*',
32-
'chrome/browser/extensions/chrome_component_extension_resource_manager.*',
33-
'chrome/browser/extensions/chrome_extension_web_contents_observer.*',
34-
'chrome/browser/extensions/component_loader.*',
35-
'chrome/browser/extensions/extension_service.*',
36-
'chrome/browser/profiles/profile.h',
37-
'chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.*',
38-
'chrome/common/extensions/api/*_features.json',
39-
'chrome/renderer/chrome_content_renderer_client.*',
40-
'chrome/renderer/extensions/chrome_extensions_renderer_client.*',
4130
'components/content_settings/core/common/content_settings_types.mojom',
4231
'components/permissions/request_type.h',
4332
'content/browser/renderer_host/render_widget_host_view_base.*',

include/cef_api_hash.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
// way that may cause binary incompatibility with other builds. The universal
4343
// hash value will change if any platform is affected whereas the platform hash
4444
// values will change only if that particular platform is affected.
45-
#define CEF_API_HASH_UNIVERSAL "9428a74387b371a45469c91f7dbd648b2dc74132"
45+
#define CEF_API_HASH_UNIVERSAL "316cc23ff49e0d0962090cbfb0a0279ce3dc3c50"
4646
#if defined(OS_WIN)
47-
#define CEF_API_HASH_PLATFORM "e76d3804b2419a0bf024e97d6b9e10df53d93dad"
47+
#define CEF_API_HASH_PLATFORM "66c126d91698670af3835a707a84ce4dbb4a16fa"
4848
#elif defined(OS_MAC)
49-
#define CEF_API_HASH_PLATFORM "c88c77c84ecbd81cbf4489c1b1ab4bf0396c26c3"
49+
#define CEF_API_HASH_PLATFORM "c1d8d20920c3a3e13a6a6efef51b2b775f69d2c7"
5050
#elif defined(OS_LINUX)
51-
#define CEF_API_HASH_PLATFORM "84373e28b1ed172ce6a08da2ea33ca787f92d6dc"
51+
#define CEF_API_HASH_PLATFORM "7ccfa4c608c16a4f8bedc97a2bdf50729784c5ee"
5252
#endif
5353

5454
#ifdef __cplusplus

include/internal/cef_types.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -3451,7 +3451,8 @@ typedef enum {
34513451
CEF_CPAIT_PRICE_READ_ANYTHING,
34523452
CEF_CPAIT_PRODUCT_SPECIFICATIONS,
34533453
CEF_CPAIT_LENS_OVERLAY,
3454-
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_LENS_OVERLAY,
3454+
CEF_CPAIT_DISCOUNTS,
3455+
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_DISCOUNTS,
34553456
} cef_chrome_page_action_icon_type_t;
34563457

34573458
///

include/internal/cef_types_content_settings.h

+25-2
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,35 @@ typedef enum {
438438

439439
/// Website setting which is used for UnusedSitePermissionsService to store
440440
/// auto-revoked notification permissions from abusive sites.
441-
REVOKED_ABUSIVE_NOTIFICATION_PERMISSIONS,
441+
CEF_CONTENT_SETTING_TYPE_REVOKED_ABUSIVE_NOTIFICATION_PERMISSIONS,
442442

443443
/// Content setting that controls tracking protection status per site.
444444
/// BLOCK: Protections enabled. This is the default state.
445445
/// ALLOW: Protections disabled.
446-
TRACKING_PROTECTION,
446+
CEF_CONTENT_SETTING_TYPE_TRACKING_PROTECTION,
447+
448+
// With this permission, when the application calls `getDisplayMedia()`, a
449+
// system audio track can be returned without showing the display media
450+
// selection picker. The application can explicitly specify
451+
// `systemAudio: 'exclude'` or `video: true` to still show the display media
452+
// selection picker if needed. Please note that the setting only works for
453+
// WebUI.
454+
CEF_CONTENT_SETTING_TYPE_DISPLAY_MEDIA_SYSTEM_AUDIO,
455+
456+
// Whether to use the higher-tier v8 optimizers for running JavaScript on the
457+
// page.
458+
CEF_CONTENT_SETTING_TYPE_JAVASCRIPT_OPTIMIZER,
459+
460+
// Content Setting for the Storage Access Headers persistent origin trial that
461+
// allows origins to opt into the storage access header behavior. Should be
462+
// scoped to `REQUESTING_ORIGIN_AND_TOP_SCHEMEFUL_SITE_SCOPE` in order to
463+
// correspond to the design of persistent origin trials. See also:
464+
// https://github.com/cfredric/storage-access-headers
465+
// ALLOW: storage access request headers will be attached to cross-site
466+
// requests, and url requests will look for response headers from
467+
// origins to retry a request or load with storage access.
468+
// BLOCK (default): no effect.
469+
CEF_CONTENT_SETTING_TYPE_STORAGE_ACCESS_HEADER_ORIGIN_TRIAL,
447470
} cef_content_setting_types_t;
448471

449472
///

libcef/browser/browser_host_base.cc

+3-4
Original file line numberDiff line numberDiff line change
@@ -1275,16 +1275,15 @@ void CefBrowserHostBase::RunSelectFile(
12751275
const ui::SelectFileDialog::FileTypeInfo* file_types,
12761276
int file_type_index,
12771277
const base::FilePath::StringType& default_extension,
1278-
gfx::NativeWindow owning_window,
1279-
void* params) {
1278+
gfx::NativeWindow owning_window) {
12801279
if (!EnsureFileDialogManager()) {
12811280
LOG(ERROR) << "File dialog canceled due to invalid state.";
1282-
listener->FileSelectionCanceled(params);
1281+
listener->FileSelectionCanceled();
12831282
return;
12841283
}
12851284
file_dialog_manager_->RunSelectFile(listener, std::move(policy), type, title,
12861285
default_path, file_types, file_type_index,
1287-
default_extension, owning_window, params);
1286+
default_extension, owning_window);
12881287
}
12891288

12901289
void CefBrowserHostBase::SelectFileListenerDestroyed(

libcef/browser/browser_host_base.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,7 @@ class CefBrowserHostBase : public CefBrowserHost,
330330
const ui::SelectFileDialog::FileTypeInfo* file_types,
331331
int file_type_index,
332332
const base::FilePath::StringType& default_extension,
333-
gfx::NativeWindow owning_window,
334-
void* params);
333+
gfx::NativeWindow owning_window);
335334
void SelectFileListenerDestroyed(ui::SelectFileDialog::Listener* listener);
336335

337336
// Called from AlloyBrowserHostImpl::GetJavaScriptDialogManager and

libcef/browser/file_dialog_manager.cc

+18-29
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,8 @@ class CefFileSelectListener : public content::FileSelectListener {
203203
class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
204204
public:
205205
CefSelectFileDialogListener(ui::SelectFileDialog::Listener* listener,
206-
void* params,
207206
base::OnceClosure callback)
208-
: listener_(listener), params_(params), callback_(std::move(callback)) {}
207+
: listener_(listener), callback_(std::move(callback)) {}
209208

210209
CefSelectFileDialogListener(const CefSelectFileDialogListener&) = delete;
211210
CefSelectFileDialogListener& operator=(const CefSelectFileDialogListener&) =
@@ -220,7 +219,7 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
220219
// Don't execute the listener.
221220
Destroy();
222221
} else {
223-
FileSelectionCanceled(params_);
222+
FileSelectionCanceled();
224223
}
225224
}
226225

@@ -229,27 +228,22 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
229228
private:
230229
~CefSelectFileDialogListener() override = default;
231230

232-
void FileSelected(const ui::SelectedFileInfo& file,
233-
int index,
234-
void* params) override {
235-
DCHECK_EQ(params, params_);
231+
void FileSelected(const ui::SelectedFileInfo& file, int index) override {
236232
executing_ = true;
237-
listener_.ExtractAsDangling()->FileSelected(file, index, params);
233+
listener_.ExtractAsDangling()->FileSelected(file, index);
238234
Destroy();
239235
}
240236

241-
void MultiFilesSelected(const std::vector<ui::SelectedFileInfo>& files,
242-
void* params) override {
243-
DCHECK_EQ(params, params_);
237+
void MultiFilesSelected(
238+
const std::vector<ui::SelectedFileInfo>& files) override {
244239
executing_ = true;
245-
listener_.ExtractAsDangling()->MultiFilesSelected(files, params);
240+
listener_.ExtractAsDangling()->MultiFilesSelected(files);
246241
Destroy();
247242
}
248243

249-
void FileSelectionCanceled(void* params) override {
250-
DCHECK_EQ(params, params_);
244+
void FileSelectionCanceled() override {
251245
executing_ = true;
252-
listener_.ExtractAsDangling()->FileSelectionCanceled(params);
246+
listener_.ExtractAsDangling()->FileSelectionCanceled();
253247
Destroy();
254248
}
255249

@@ -259,7 +253,6 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
259253
}
260254

261255
raw_ptr<ui::SelectFileDialog::Listener> listener_;
262-
const raw_ptr<void> params_;
263256
base::OnceClosure callback_;
264257

265258
// Used to avoid re-entrancy from Cancel().
@@ -378,18 +371,16 @@ void CefFileDialogManager::RunSelectFile(
378371
const ui::SelectFileDialog::FileTypeInfo* file_types,
379372
int file_type_index,
380373
const base::FilePath::StringType& default_extension,
381-
gfx::NativeWindow owning_window,
382-
void* params) {
374+
gfx::NativeWindow owning_window) {
383375
CEF_REQUIRE_UIT();
384376

385377
active_listeners_.insert(listener);
386378

387379
auto chooser_params =
388380
SelectFileToFileChooserParams(type, title, default_path, file_types);
389-
auto callback =
390-
base::BindOnce(&CefFileDialogManager::SelectFileDoneByDelegateCallback,
391-
weak_ptr_factory_.GetWeakPtr(),
392-
base::UnsafeDangling(listener), base::Unretained(params));
381+
auto callback = base::BindOnce(
382+
&CefFileDialogManager::SelectFileDoneByDelegateCallback,
383+
weak_ptr_factory_.GetWeakPtr(), base::UnsafeDangling(listener));
393384
callback = MaybeRunDelegate(chooser_params, file_types->extensions,
394385
file_types->extension_description_overrides,
395386
std::move(callback));
@@ -423,7 +414,7 @@ void CefFileDialogManager::RunSelectFile(
423414

424415
// This object will delete itself.
425416
dialog_listener_ = new CefSelectFileDialogListener(
426-
listener, params,
417+
listener,
427418
base::BindOnce(&CefFileDialogManager::SelectFileDoneByListenerCallback,
428419
weak_ptr_factory_.GetWeakPtr(),
429420
base::UnsafeDangling(listener),
@@ -442,7 +433,7 @@ void CefFileDialogManager::RunSelectFile(
442433
}
443434

444435
dialog_->SelectFile(type, title, default_path, file_types, file_type_index,
445-
default_extension, owning_window, params);
436+
default_extension, owning_window);
446437
}
447438

448439
void CefFileDialogManager::SelectFileListenerDestroyed(
@@ -549,7 +540,6 @@ CefFileDialogManager::MaybeRunDelegate(
549540

550541
void CefFileDialogManager::SelectFileDoneByDelegateCallback(
551542
MayBeDangling<ui::SelectFileDialog::Listener> listener,
552-
void* params,
553543
const std::vector<base::FilePath>& paths) {
554544
CEF_REQUIRE_UIT();
555545

@@ -562,12 +552,11 @@ void CefFileDialogManager::SelectFileDoneByDelegateCallback(
562552
active_listeners_.erase(listener.get());
563553

564554
if (paths.empty()) {
565-
listener->FileSelectionCanceled(params);
555+
listener->FileSelectionCanceled();
566556
} else if (paths.size() == 1) {
567-
listener->FileSelected(ui::SelectedFileInfo(paths[0]), /*index=*/0, params);
557+
listener->FileSelected(ui::SelectedFileInfo(paths[0]), /*index=*/0);
568558
} else {
569-
listener->MultiFilesSelected(ui::FilePathListToSelectedFileInfoList(paths),
570-
params);
559+
listener->MultiFilesSelected(ui::FilePathListToSelectedFileInfoList(paths));
571560
}
572561
// |listener| is likely deleted at this point.
573562
}

libcef/browser/file_dialog_manager.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ class CefFileDialogManager {
6666
const ui::SelectFileDialog::FileTypeInfo* file_types,
6767
int file_type_index,
6868
const base::FilePath::StringType& default_extension,
69-
gfx::NativeWindow owning_window,
70-
void* params);
69+
gfx::NativeWindow owning_window);
7170

7271
// Must be called when the |listener| passed to RunSelectFile is destroyed.
7372
void SelectFileListenerDestroyed(ui::SelectFileDialog::Listener* listener);
@@ -83,7 +82,6 @@ class CefFileDialogManager {
8382

8483
void SelectFileDoneByDelegateCallback(
8584
MayBeDangling<ui::SelectFileDialog::Listener> listener,
86-
void* params,
8785
const std::vector<base::FilePath>& paths);
8886
void SelectFileDoneByListenerCallback(
8987
MayBeDangling<ui::SelectFileDialog::Listener> listener,

0 commit comments

Comments
 (0)