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 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patch/patches/resource_bundle_2512.patch
View File

@ -1,8 +1,8 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index 65585cd5cb5a5..d5d669f2a63dc 100644
index 4803daaa1eadc..b66a19afc4b76 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -838,6 +838,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -841,6 +841,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
: delegate_(delegate),
locale_resources_data_lock_(new base::Lock),
max_scale_factor_(k100Percent) {
@ -15,7 +15,7 @@ index 65585cd5cb5a5..d5d669f2a63dc 100644
mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kMangleLocalizedStrings);
}
@@ -847,6 +853,11 @@ ResourceBundle::~ResourceBundle() {
@@ -850,6 +856,11 @@ ResourceBundle::~ResourceBundle() {
UnloadLocaleResources();
}
@ -28,12 +28,12 @@ index 65585cd5cb5a5..d5d669f2a63dc 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index 21274f68fb04d..0e134919b3b8b 100644
index 098b9128f6515..a74e733afd228 100644
--- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h
@@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
// Return the global resource loader instance.
static ResourceBundle& GetSharedInstance();
@@ -194,6 +194,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
ResourceBundle(const ResourceBundle&) = delete;
ResourceBundle& operator=(const ResourceBundle&) = delete;
+ // With CEF's multi-threaded mode the ResourceBundle may be created/destroyed
+ // on the main thread but accessed on the UI thread. Call this method on the