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 95.0.4638.0 (#920003)

Browse Source 
Known issues:
- Windows ARM64 builds are currently failing due to
  https://crbug.com/1242884#c31
This commit is contained in:
Marshall Greenblatt
2021-09-20 12:06:23 +03:00
parent 0a10fd4506
commit 5782fdca16
88 changed files with 597 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/common/alloy/alloy_main_delegate.cc
View File

@@ -359,7 +359,7 @@ void AlloyMainDelegate::PreSandboxStartup() {
chrome::DIR_USER_DATA);
InitializeResourceBundle();
MaybeInitializeGDI();
MaybePatchGdiGetFontData();
}
void AlloyMainDelegate::SandboxInitialized(const std::string& process_type) {
@@ -512,7 +512,7 @@ void AlloyMainDelegate::InitializeResourceBundle() {
if (base::PathExists(resources_pak_file)) {
resource_bundle.AddDataPackFromPath(resources_pak_file,
ui::SCALE_FACTOR_NONE);
ui::kScaleFactorNone);
} else {
LOG(ERROR) << "Could not load resources.pak";
}
@@ -520,19 +520,19 @@ void AlloyMainDelegate::InitializeResourceBundle() {
// Always load the 1x data pack first as the 2x data pack contains both 1x
// and 2x images. The 1x data pack only has 1x images, thus passes in an
// accurate scale factor to gfx::ImageSkia::AddRepresentation.
if (resource_util::IsScaleFactorSupported(ui::SCALE_FACTOR_100P)) {
if (resource_util::IsScaleFactorSupported(ui::k100Percent)) {
if (base::PathExists(chrome_100_percent_pak_file)) {
resource_bundle.AddDataPackFromPath(chrome_100_percent_pak_file,
ui::SCALE_FACTOR_100P);
ui::k100Percent);
} else {
LOG(ERROR) << "Could not load chrome_100_percent.pak";
}
}
if (resource_util::IsScaleFactorSupported(ui::SCALE_FACTOR_200P)) {
if (resource_util::IsScaleFactorSupported(ui::k200Percent)) {
if (base::PathExists(chrome_200_percent_pak_file)) {
resource_bundle.AddDataPackFromPath(chrome_200_percent_pak_file,
ui::SCALE_FACTOR_200P);
ui::k200Percent);
} else {
LOG(ERROR) << "Could not load chrome_200_percent.pak";
}