Update to Chromium version 95.0.4638.0 (#920003)

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

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";
}

View File

@@ -11,7 +11,6 @@
#include "base/containers/contains.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
#include "net/net_buildflags.h"
#include "url/url_constants.h"
#include "url/url_util.h"
@@ -56,22 +55,19 @@ void AddInternalSchemes(content::ContentClient::Schemes* schemes) {
bool IsInternalHandledScheme(const std::string& scheme) {
static const char* schemes[] = {
url::kAboutScheme,
url::kBlobScheme,
content::kChromeDevToolsScheme,
content::kChromeUIScheme,
url::kDataScheme,
extensions::kExtensionScheme,
url::kFileScheme,
url::kFileSystemScheme,
#if !BUILDFLAG(DISABLE_FTP_SUPPORT)
url::kFtpScheme,
#endif
url::kHttpScheme,
url::kHttpsScheme,
url::kJavaScriptScheme,
url::kWsScheme,
url::kWssScheme,
url::kAboutScheme,
url::kBlobScheme,
content::kChromeDevToolsScheme,
content::kChromeUIScheme,
url::kDataScheme,
extensions::kExtensionScheme,
url::kFileScheme,
url::kFileSystemScheme,
url::kHttpScheme,
url::kHttpsScheme,
url::kJavaScriptScheme,
url::kWsScheme,
url::kWssScheme,
};
for (size_t i = 0; i < sizeof(schemes) / sizeof(schemes[0]); ++i) {

View File

@@ -50,7 +50,7 @@ bool CefResourceBundleDelegate::GetRawDataResource(
if (handler.get()) {
void* data = nullptr;
size_t data_size = 0;
if (scale_factor != ui::SCALE_FACTOR_NONE) {
if (scale_factor != ui::kScaleFactorNone) {
if (handler->GetDataResourceForScale(
resource_id, static_cast<cef_scale_factor_t>(scale_factor),
data, data_size)) {

View File

@@ -8,7 +8,7 @@
#include "include/cef_base.h"
#include "ui/base/resource/scale_factor.h"
#include "ui/base/resource/resource_scale_factor.h"
namespace base {
class CommandLine;

View File

@@ -1107,7 +1107,7 @@ CefRefPtr<CefListValue> CefListValueImpl::Copy() {
bool CefListValueImpl::SetSize(size_t size) {
CEF_VALUE_VERIFY_RETURN(true, false);
size_t current_size = const_value().GetSize();
size_t current_size = const_value().GetList().size();
if (size < current_size) {
// Clean up any values above the requested size.
for (size_t i = current_size - 1; i >= size; --i)
@@ -1121,7 +1121,7 @@ bool CefListValueImpl::SetSize(size_t size) {
size_t CefListValueImpl::GetSize() {
CEF_VALUE_VERIFY_RETURN(false, 0);
return const_value().GetSize();
return const_value().GetList().size();
}
bool CefListValueImpl::Clear() {