365 lines
21 KiB
Diff
365 lines
21 KiB
Diff
|
diff -up chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me chromium-116.0.5845.50/net/dns/host_resolver_cache.cc
|
||
|
--- chromium-116.0.5845.50/net/dns/host_resolver_cache.cc.me
|
||
|
+++ chromium-116.0.5845.50/net/dns/host_resolver_cache.cc
|
||
|
@@ -161,7 +161,7 @@ void HostResolverCache::Set(
|
||
|
|
||
|
std::string domain_name = result->domain_name();
|
||
|
entries_.emplace(
|
||
|
- Key(std::move(domain_name), network_anonymization_key),
|
||
|
+ Key{std::move(domain_name), network_anonymization_key},
|
||
|
Entry(std::move(result), source, secure, staleness_generation_));
|
||
|
|
||
|
if (entries_.size() > max_entries_) {
|
||
|
diff -up chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
||
|
--- chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.me 2023-08-02 15:17:52.613858423 +0200
|
||
|
+++ chromium-116.0.5845.50/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc 2023-08-02 15:18:43.269790877 +0200
|
||
|
@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOut
|
||
|
|
||
|
// Issue readbacks from the surfaces:
|
||
|
for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
|
||
|
- SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
|
||
|
+ SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
|
||
|
SkImageInfo dst_info = SkImageInfo::Make(
|
||
|
size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
|
||
|
kUnpremul_SkAlphaType);
|
||
|
diff -up chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
||
|
--- chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.me 2023-08-02 21:32:14.195705494 +0200
|
||
|
+++ chromium-116.0.5845.50/third_party/blink/renderer/platform/fonts/palette_interpolation.cc 2023-08-02 21:59:08.156532934 +0200
|
||
|
@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride>
|
||
|
color_interpolation_space, hue_interpolation_method, start_color,
|
||
|
end_color, percentage, alpha_multiplier);
|
||
|
|
||
|
- FontPalette::FontPaletteOverride result_color_record(i, result_color);
|
||
|
+ FontPalette::FontPaletteOverride result_color_record{static_cast<int>(i), result_color};
|
||
|
result_color_records.push_back(result_color_record);
|
||
|
}
|
||
|
return result_color_records;
|
||
|
diff -up chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h
|
||
|
--- chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h.me 2023-08-03 08:27:11.371750178 +0200
|
||
|
+++ chromium-116.0.5845.50/ui/base/wayland/color_manager_util.h 2023-08-03 10:39:07.266989323 +0200
|
||
|
@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::
|
||
|
zcr_color_manager_v1_chromaticity_names,
|
||
|
PrimaryVersion>(
|
||
|
{{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB,
|
||
|
- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::BT470M,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::SMPTE240M,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::XYZ_D50,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::SMPTEST428_1,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::SMPTEST431_2,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM,
|
||
|
- PrimaryVersion(
|
||
|
+ PrimaryVersion{
|
||
|
gfx::ColorSpace::PrimaryID::FILM,
|
||
|
- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}});
|
||
|
+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}});
|
||
|
|
||
|
// A map from the zcr_color_manager_v1 eotf_names enum values
|
||
|
// representing well-known EOTFs, to their equivalent TransferIDs.
|
||
|
@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixe
|
||
|
zcr_color_manager_v1_eotf_names,
|
||
|
TransferVersion>({
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::LINEAR,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::BT709,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::BT709,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||
|
// This is ever so slightly inaccurate. The number ought to be
|
||
|
// 2.19921875f, not 2.2
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::HLG,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::HLG,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1,
|
||
|
- TransferVersion(
|
||
|
+ TransferVersion{
|
||
|
gfx::ColorSpace::TransferID::SMPTEST428_1,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::LOG,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::LOG,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4,
|
||
|
- TransferVersion(
|
||
|
+ TransferVersion{
|
||
|
gfx::ColorSpace::TransferID::IEC61966_2_4,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS,
|
||
|
- TransferVersion(
|
||
|
+ TransferVersion{
|
||
|
gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28,
|
||
|
- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)},
|
||
|
+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}},
|
||
|
});
|
||
|
|
||
|
// A map from the SDR zcr_color_manager_v1 eotf_names enum values
|
||
|
@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixe
|
||
|
constexpr auto kTransferMap =
|
||
|
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>({
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||
|
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||
|
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709,
|
||
|
- TransferFnVersion(
|
||
|
+ TransferFnVersion{
|
||
|
SkNamedTransferFnExt::kRec709,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087,
|
||
|
- TransferFnVersion(gamma24, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{gamma24, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB,
|
||
|
- TransferFnVersion(SkNamedTransferFnExt::kA98RGB,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
});
|
||
|
|
||
|
// A map from the HDR zcr_color_manager_v1 eotf_names enum values
|
||
|
@@ -194,68 +194,68 @@ constexpr auto kTransferMap =
|
||
|
constexpr auto kHDRTransferMap =
|
||
|
base::MakeFixedFlatMap<zcr_color_manager_v1_eotf_names, TransferFnVersion>(
|
||
|
{{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR,
|
||
|
- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB,
|
||
|
- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ,
|
||
|
- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)},
|
||
|
+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG,
|
||
|
- TransferFnVersion(SkNamedTransferFn::kHLG,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)},
|
||
|
+ TransferFnVersion{SkNamedTransferFn::kHLG,
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10,
|
||
|
- TransferFnVersion(
|
||
|
+ TransferFnVersion{
|
||
|
SkNamedTransferFnExt::kSRGBExtended1023Over510,
|
||
|
- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}});
|
||
|
+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}});
|
||
|
|
||
|
// A map from zcr_color_manager_v1 matrix_names enum values to
|
||
|
// gfx::ColorSpace::MatrixIDs.
|
||
|
constexpr auto kMatrixMap =
|
||
|
base::MakeFixedFlatMap<zcr_color_manager_v1_matrix_names, MatrixVersion>(
|
||
|
{{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::BT709,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG,
|
||
|
- MatrixVersion(
|
||
|
+ MatrixVersion{
|
||
|
gfx::ColorSpace::MatrixID::BT470BG,
|
||
|
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)},
|
||
|
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG,
|
||
|
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG,
|
||
|
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX,
|
||
|
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX,
|
||
|
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::GBR,
|
||
|
- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR,
|
||
|
+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M,
|
||
|
- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M,
|
||
|
- kDefaultSinceVersion)}});
|
||
|
+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M,
|
||
|
+ kDefaultSinceVersion}}});
|
||
|
|
||
|
// A map from zcr_color_manager_v1 range_names enum values to
|
||
|
// gfx::ColorSpace::RangeIDs.
|
||
|
constexpr auto kRangeMap =
|
||
|
base::MakeFixedFlatMap<zcr_color_manager_v1_range_names, RangeVersion>(
|
||
|
{{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED,
|
||
|
- RangeVersion(gfx::ColorSpace::RangeID::LIMITED,
|
||
|
- kDefaultSinceVersion)},
|
||
|
+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED,
|
||
|
+ kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL,
|
||
|
- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)},
|
||
|
+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}},
|
||
|
{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED,
|
||
|
- RangeVersion(gfx::ColorSpace::RangeID::DERIVED,
|
||
|
- kDefaultSinceVersion)}});
|
||
|
+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED,
|
||
|
+ kDefaultSinceVersion}}});
|
||
|
|
||
|
zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity(
|
||
|
gfx::ColorSpace::PrimaryID primaryID,
|
||
|
diff -up chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
||
|
--- chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc.me 2023-08-03 13:23:33.748394615 +0200
|
||
|
+++ chromium-116.0.5845.50/chrome/browser/ui/omnibox/chrome_omnibox_client.cc 2023-08-03 13:25:01.140489840 +0200
|
||
|
@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocomplete
|
||
|
alternative_nav_match);
|
||
|
|
||
|
// Store the details necessary to open the omnibox match via browser commands.
|
||
|
- location_bar_->set_navigation_params(LocationBar::NavigationParams(
|
||
|
+ location_bar_->set_navigation_params(LocationBar::NavigationParams{
|
||
|
destination_url, disposition, transition, match_selection_timestamp,
|
||
|
destination_url_entered_without_scheme,
|
||
|
- destination_url_entered_with_http_scheme));
|
||
|
+ destination_url_entered_with_http_scheme});
|
||
|
|
||
|
if (browser_) {
|
||
|
auto navigation = chrome::OpenCurrentURL(browser_);
|