|
|
@@ -0,0 +1,536 @@
|
|
|
+diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
|
|
+index 93ec91e38b9..acd25f25d15 100644
|
|
|
+--- a/chrome/browser/download/bubble/download_bubble_update_service.cc
|
|
|
++++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
|
|
|
+@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item) {
|
|
|
+ // Helper to get an iterator to the last element in the cache. The cache
|
|
|
+ // must not be empty.
|
|
|
+ template <typename Item>
|
|
|
+-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
|
|
++typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
|
|
|
+ CHECK(!cache.empty());
|
|
|
+ auto it = cache.end();
|
|
|
+ return std::prev(it);
|
|
|
+@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheImpl(
|
|
|
+ }
|
|
|
+
|
|
|
+ template <typename Id, typename Item>
|
|
|
+-SortedItems<Item>::iterator
|
|
|
++typename SortedItems<Item>::iterator
|
|
|
+ DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
|
|
|
+- SortedItems<Item>::iterator iter,
|
|
|
++ typename SortedItems<Item>::iterator iter,
|
|
|
+ SortedItems<Item>& cache,
|
|
|
+ IterMap<Id, Item>& iter_map) {
|
|
|
+ CHECK(iter != cache.end());
|
|
|
+diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
|
|
+index d923cdfa322..36ac59ca7ac 100644
|
|
|
+--- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
|
|
++++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
|
|
|
+@@ -470,10 +470,10 @@ void ChromeOmniboxClient::OnAutocompleteAccept(
|
|
|
+ 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_);
|
|
|
+diff --git a/chrome/browser/ui/profile_view_utils.h b/chrome/browser/ui/profile_view_utils.h
|
|
|
+index 4aa53f094c2..5a7250f3876 100644
|
|
|
+--- a/chrome/browser/ui/profile_view_utils.h
|
|
|
++++ b/chrome/browser/ui/profile_view_utils.h
|
|
|
+@@ -7,6 +7,7 @@
|
|
|
+
|
|
|
+ #include <string>
|
|
|
+ #include <utility>
|
|
|
++#include <vector>
|
|
|
+
|
|
|
+ class Profile;
|
|
|
+ class ProfileAttributesEntry;
|
|
|
+diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
|
|
|
+index a29dc8e4818..00aaf9b4067 100644
|
|
|
+--- a/chrome/test/chromedriver/capabilities.cc
|
|
|
++++ b/chrome/test/chromedriver/capabilities.cc
|
|
|
+@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::Value& option,
|
|
|
+ "'version' field of type string");
|
|
|
+ }
|
|
|
+
|
|
|
+- brands.emplace_back(*brand, *version);
|
|
|
++ brands.emplace_back(BrandVersion{*brand, *version});
|
|
|
+ }
|
|
|
+
|
|
|
+ client_hints.brands = std::move(brands);
|
|
|
+@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::Value& option,
|
|
|
+ "a 'version' field of type string");
|
|
|
+ }
|
|
|
+
|
|
|
+- full_version_list.emplace_back(*brand, *version);
|
|
|
++ full_version_list.emplace_back(BrandVersion{*brand, *version});
|
|
|
+ }
|
|
|
+
|
|
|
+ client_hints.full_version_list = std::move(full_version_list);
|
|
|
+diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h
|
|
|
+index 31417bc8d9d..abd41f4c8d4 100644
|
|
|
+--- a/components/optimization_guide/core/tflite_model_executor.h
|
|
|
++++ b/components/optimization_guide/core/tflite_model_executor.h
|
|
|
+@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
|
|
|
+ void SendForBatchExecution(
|
|
|
+ BatchExecutionCallback callback_on_complete,
|
|
|
+ base::TimeTicks start_time,
|
|
|
+- ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
|
|
++ typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
|
|
|
+ override {
|
|
|
+ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
|
|
|
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
+diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
|
|
+index 3bace0dab10..0ea54d136ea 100644
|
|
|
+--- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
|
|
++++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
|
|
|
+@@ -1496,7 +1496,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
|
|
|
+
|
|
|
+ // 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 --git a/content/public/browser/web_ui_browser_interface_broker_registry.h b/content/public/browser/web_ui_browser_interface_broker_registry.h
|
|
|
+index 0a419be66b3..7253c9680f7 100644
|
|
|
+--- a/content/public/browser/web_ui_browser_interface_broker_registry.h
|
|
|
++++ b/content/public/browser/web_ui_browser_interface_broker_registry.h
|
|
|
+@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegistry {
|
|
|
+ //
|
|
|
+ // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation.
|
|
|
+ template <typename ControllerType>
|
|
|
+- JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
|
|
++ typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() {
|
|
|
+ using Traits = JsBridgeTraits<ControllerType>;
|
|
|
+- using Interface = Traits::Interface;
|
|
|
+- using JsBridgeBinderInitializer = Traits::BinderInitializer;
|
|
|
++ using Interface = typename Traits::Interface;
|
|
|
++ using JsBridgeBinderInitializer = typename Traits::BinderInitializer;
|
|
|
+
|
|
|
+ // WebUIController::GetType() requires an instantiated WebUIController
|
|
|
+ // (because it's a virtual method and can't be static). Here we only have
|
|
|
+diff --git a/net/dns/host_resolver_cache.cc b/net/dns/host_resolver_cache.cc
|
|
|
+index df037a1a440..b2152d54408 100644
|
|
|
+--- a/net/dns/host_resolver_cache.cc
|
|
|
++++ b/net/dns/host_resolver_cache.cc
|
|
|
+@@ -159,7 +159,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 --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
|
|
+index f9cf9f5ae86..0566ae194ce 100644
|
|
|
+--- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
|
|
++++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
|
|
|
+@@ -169,7 +169,7 @@ class HTMLFastPathParser {
|
|
|
+ using Span = base::span<const Char>;
|
|
|
+ using USpan = base::span<const UChar>;
|
|
|
+ // 32 matches that used by HTMLToken::Attribute.
|
|
|
+- typedef std::conditional<std::is_same_v<Char, UChar>,
|
|
|
++ typedef typename std::conditional<std::is_same_v<Char, UChar>,
|
|
|
+ UCharLiteralBuffer<32>,
|
|
|
+ LCharLiteralBuffer<32>>::type LiteralBufferType;
|
|
|
+ typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
|
|
|
+diff --git a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
|
|
+index 8bb1639676c..350bdbd5fde 100644
|
|
|
+--- a/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
|
|
++++ b/third_party/blink/renderer/core/paint/object_paint_properties_sparse.h
|
|
|
+@@ -8,6 +8,7 @@
|
|
|
+ #include <array>
|
|
|
+ #include <memory>
|
|
|
+ #include <utility>
|
|
|
++#include <variant>
|
|
|
+
|
|
|
+ #include "base/dcheck_is_on.h"
|
|
|
+ #include "base/memory/ptr_util.h"
|
|
|
+@@ -269,8 +270,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public ObjectPaintProperties {
|
|
|
+ NodeList& nodes,
|
|
|
+ NodeId node_id,
|
|
|
+ const ParentType& parent,
|
|
|
+- NodeType::State&& state,
|
|
|
+- const NodeType::AnimationState& animation_state =
|
|
|
++ typename NodeType::State&& state,
|
|
|
++ const typename NodeType::AnimationState& animation_state =
|
|
|
+ NodeType::AnimationState()) {
|
|
|
+ // First, check if we need to add a new node.
|
|
|
+ if (!nodes.HasField(node_id)) {
|
|
|
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
|
|
+index 883d769ca4b..1b4b75bbaf7 100644
|
|
|
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
|
|
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
|
|
|
+@@ -83,12 +83,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
|
|
|
+ case kGradient:
|
|
|
+ GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
|
|
|
+ ImageDrawOptions());
|
|
|
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
|
|
|
++ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
|
|
|
+ break;
|
|
|
+ case kImagePattern:
|
|
|
+ GetCanvasPattern()->GetPattern()->ApplyToFlags(
|
|
|
+ flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
|
|
|
+- flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
|
|
|
++ flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ NOTREACHED();
|
|
|
+diff --git a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
|
|
+index 5a0121510ae..0cf45e0b0da 100644
|
|
|
+--- a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
|
|
++++ b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
|
|
|
+@@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterpolation::MixColorRecords(
|
|
|
+ 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{(int)i, result_color};
|
|
|
+ result_color_records.push_back(result_color_record);
|
|
|
+ }
|
|
|
+ return result_color_records;
|
|
|
+diff --git a/ui/base/wayland/color_manager_util.h b/ui/base/wayland/color_manager_util.h
|
|
|
+index fa1dd422c0e..52d3702e3e5 100644
|
|
|
+--- a/ui/base/wayland/color_manager_util.h
|
|
|
++++ b/ui/base/wayland/color_manager_util.h
|
|
|
+@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap<
|
|
|
+ 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::MakeFixedFlatMap<
|
|
|
+ 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::MakeFixedFlatMap<
|
|
|
+ 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,
|
|
|
+--- chromium-116.0.5845.82.orig/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-11 18:10:42.162664104 +0000
|
|
|
++++ chromium-116.0.5845.82/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-11 18:14:48.571543555 +0000
|
|
|
+@@ -207,8 +207,8 @@ void OneTimePermissionProvider::OnSuspen
|
|
|
+
|
|
|
+ while (rule_iterator && rule_iterator->HasNext()) {
|
|
|
+ auto rule = rule_iterator->Next();
|
|
|
+- patterns_to_delete.emplace_back(setting_type, rule->primary_pattern,
|
|
|
+- rule->secondary_pattern);
|
|
|
++ patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern,
|
|
|
++ rule->secondary_pattern});
|
|
|
+ permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
|
|
+ setting_type,
|
|
|
+ permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND);
|
|
|
+@@ -303,7 +303,7 @@ void OneTimePermissionProvider::DeleteEn
|
|
|
+ if (rule->primary_pattern.Matches(origin_gurl) &&
|
|
|
+ rule->secondary_pattern.Matches(origin_gurl)) {
|
|
|
+ patterns_to_delete.emplace_back(
|
|
|
+- content_setting_type, rule->primary_pattern, rule->secondary_pattern);
|
|
|
++ ContentSettingEntry{content_setting_type, rule->primary_pattern, rule->secondary_pattern});
|
|
|
+ permissions::PermissionUmaUtil::RecordOneTimePermissionEvent(
|
|
|
+ content_setting_type, trigger_event);
|
|
|
+ }
|
