mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium version 76.0.3809.0 (#665002)
OSR tests will be fixed by a follow-up merge of Viz support (see issue #2575).
This commit is contained in:
		
				
					committed by
					
						
						Marshall Greenblatt
					
				
			
			
				
	
			
			
			
						parent
						
							5892ffc382
						
					
				
				
					commit
					cc0db5f166
				
			@@ -1,8 +1,8 @@
 | 
			
		||||
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
 | 
			
		||||
index 340291d8c8f3..34abefbd1c77 100644
 | 
			
		||||
index ab883f7cb8bb..ca12051438e2 100644
 | 
			
		||||
--- ui/base/resource/resource_bundle.cc
 | 
			
		||||
+++ ui/base/resource/resource_bundle.cc
 | 
			
		||||
@@ -716,6 +716,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
 | 
			
		||||
@@ -725,6 +725,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
 | 
			
		||||
     : delegate_(delegate),
 | 
			
		||||
       locale_resources_data_lock_(new base::Lock),
 | 
			
		||||
       max_scale_factor_(SCALE_FACTOR_100P) {
 | 
			
		||||
@@ -15,7 +15,7 @@ index 340291d8c8f3..34abefbd1c77 100644
 | 
			
		||||
   mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
 | 
			
		||||
       switches::kMangleLocalizedStrings);
 | 
			
		||||
 }
 | 
			
		||||
@@ -725,6 +731,11 @@ ResourceBundle::~ResourceBundle() {
 | 
			
		||||
@@ -734,6 +740,11 @@ ResourceBundle::~ResourceBundle() {
 | 
			
		||||
   UnloadLocaleResources();
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,7 @@ index 340291d8c8f3..34abefbd1c77 100644
 | 
			
		||||
 void ResourceBundle::InitSharedInstance(Delegate* delegate) {
 | 
			
		||||
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
 | 
			
		||||
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
 | 
			
		||||
index 1f0f0b575e44..b3f8d28b7a6e 100644
 | 
			
		||||
index 23005f6da221..3c87746c5a3d 100644
 | 
			
		||||
--- ui/base/resource/resource_bundle.h
 | 
			
		||||
+++ ui/base/resource/resource_bundle.h
 | 
			
		||||
@@ -150,6 +150,11 @@ class UI_BASE_EXPORT ResourceBundle {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user