recipes-wam/cef/files/chromium/0011-meta-browser-Avoid-parenthesized-initialization-of-a.patch

   1 From 03e9492ef563af17682683b6db5761d1c2ece8cc Mon Sep 17 00:00:00 2001
   2 From: Max Ihlenfeldt <max@igalia.com>
   3 Date: Thu, 3 Aug 2023 13:31:15 +0000
   4 Subject: [PATCH 11/33] [meta-browser] Avoid parenthesized initialization of
   5  aggregates
   6
   7 clang < 16 doesn't support C++20's "Parenthesized initialization of
   8 aggregates" [1]. To fix build errors with older clang versions, we need
   9 to either explicitly define a constructor that does the initialization,
  10 or initialize the aggregate using curly braces.
  11
  12 [1] https://clang.llvm.org/cxx_status.html
  13
  14 Upstream-Status: Inappropriate [specific to older versions of clang]
  15 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  16 ---
  17  .../browser/content_settings/one_time_permission_provider.h  | 1 +
  18  chrome/browser/ui/omnibox/chrome_omnibox_client.cc           | 4 ++--
  19  chrome/test/chromedriver/chrome/client_hints.h               | 1 +
  20  .../display_embedder/skia_output_surface_impl_on_gpu.cc      | 2 +-
  21  net/dns/host_resolver_cache.cc                               | 2 +-
  22  .../blink/renderer/modules/canvas/canvas2d/canvas_style.cc   | 4 ++--
  23  .../blink/renderer/platform/fonts/palette_interpolation.cc   | 2 +-
  24  ui/base/wayland/color_manager_util.h                         | 5 +++++
  25  8 files changed, 14 insertions(+), 7 deletions(-)
  26
  27 diff --git a/chrome/browser/content_settings/one_time_permission_provider.h b/chrome/browser/content_settings/one_time_permission_provider.h
  28 index 839bec7daff97..2a000003507cf 100644
  29 --- a/chrome/browser/content_settings/one_time_permission_provider.h
  30 +++ b/chrome/browser/content_settings/one_time_permission_provider.h
  31 @@ -92,6 +92,7 @@ class OneTimePermissionProvider
  32      ContentSettingsType type;
  33      ContentSettingsPattern primary_pattern;
  34      ContentSettingsPattern secondary_pattern;
  35 +    ContentSettingEntry(ContentSettingsType t, ContentSettingsPattern p, ContentSettingsPattern s) : type(t), primary_pattern(p), secondary_pattern(s) {}
  36    };
  37
  38    void DeleteEntriesAndNotify(
  39 diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
  40 index 7ee2e0645e6c8..e036eeea4a5f9 100644
  41 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
  42 +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
  43 @@ -474,10 +474,10 @@ void ChromeOmniboxClient::OnAutocompleteAccept(
  44                alternative_nav_match);
  45
  46    // Store the details necessary to open the omnibox match via browser commands.
  47 -  location_bar_->set_navigation_params(LocationBar::NavigationParams(
  48 +  location_bar_->set_navigation_params(LocationBar::NavigationParams {
  49        destination_url, disposition, transition, match_selection_timestamp,
  50        destination_url_entered_without_scheme,
  51 -      destination_url_entered_with_http_scheme));
  52 +      destination_url_entered_with_http_scheme});
  53
  54    if (browser_) {
  55      auto navigation = chrome::OpenCurrentURL(browser_);
  56 diff --git a/chrome/test/chromedriver/chrome/client_hints.h b/chrome/test/chromedriver/chrome/client_hints.h
  57 index 8c13bd3321c5e..42dc1acf75ec5 100644
  58 --- a/chrome/test/chromedriver/chrome/client_hints.h
  59 +++ b/chrome/test/chromedriver/chrome/client_hints.h
  60 @@ -19,6 +19,7 @@ struct BrandVersion {
  61    // * "major version" for "brands",
  62    // * "full version" for "fullVersionList".
  63    std::string version;
  64 +  BrandVersion(std::string b, std::string v) : brand(b), version(v) {}
  65  };
  66
  67  // User-Agent Client Hints
  68 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
  69 index 9e04843c454e3..e4981a96bbb06 100644
  70 --- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
  71 +++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
  72 @@ -1521,7 +1521,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
  73
  74        // Issue readbacks from the surfaces:
  75        for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
  76 -        SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
  77 +        SkISize size {plane_surfaces[i]->width(), plane_surfaces[i]->height()};
  78          SkImageInfo dst_info = SkImageInfo::Make(
  79              size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
  80              kUnpremul_SkAlphaType);
  81 diff --git a/net/dns/host_resolver_cache.cc b/net/dns/host_resolver_cache.cc
  82 index e54ed00c913ba..7d1165e7fcacf 100644
  83 --- a/net/dns/host_resolver_cache.cc
  84 +++ b/net/dns/host_resolver_cache.cc
  85 @@ -161,7 +161,7 @@ void HostResolverCache::Set(
  86
  87    std::string domain_name = result->domain_name();
  88    entries_.emplace(
  89 -      Key(std::move(domain_name), network_anonymization_key),
  90 +      Key {std::move(domain_name), network_anonymization_key},
  91        Entry(std::move(result), source, secure, staleness_generation_));
  92
  93    if (entries_.size() > max_entries_) {
  94 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
  95 index 883d769ca4b24..3dcd0d73468fc 100644
  96 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
  97 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
  98 @@ -83,12 +83,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
  99      case kGradient:
 100        GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
 101                                                         ImageDrawOptions());
 102 -      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
 103 +      flags.setColor(SkColor4f {0.0f, 0.0f, 0.0f, global_alpha});
 104        break;
 105      case kImagePattern:
 106        GetCanvasPattern()->GetPattern()->ApplyToFlags(
 107            flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
 108 -      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
 109 +      flags.setColor(SkColor4f {0.0f, 0.0f, 0.0f, global_alpha});
 110        break;
 111      default:
 112        NOTREACHED();
 113 diff --git a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
 114 index 1ce08e956a7aa..d6521525a52f6 100644
 115 --- a/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
 116 +++ b/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
 117 @@ -31,7 +31,7 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterpolation::MixColorRecords(
 118          color_interpolation_space, hue_interpolation_method, start_color,
 119          end_color, percentage, alpha_multiplier);
 120
 121 -    FontPalette::FontPaletteOverride result_color_record(i, result_color);
 122 +    FontPalette::FontPaletteOverride result_color_record {static_cast<int>(i), result_color};
 123      result_color_records.push_back(result_color_record);
 124    }
 125    return result_color_records;
 126 diff --git a/ui/base/wayland/color_manager_util.h b/ui/base/wayland/color_manager_util.h
 127 index fa1dd422c0e60..c54ace574e52e 100644
 128 --- a/ui/base/wayland/color_manager_util.h
 129 +++ b/ui/base/wayland/color_manager_util.h
 130 @@ -23,26 +23,31 @@ constexpr uint32_t kDefaultSinceVersion = 1;
 131  struct TransferFnVersion {
 132    skcms_TransferFunction transfer_fn;
 133    uint32_t version;
 134 +  TransferFnVersion(skcms_TransferFunction t, uint32_t v) : transfer_fn(t), version(v) {}
 135  };
 136
 137  struct TransferVersion {
 138    gfx::ColorSpace::TransferID transfer;
 139    uint32_t version;
 140 +  TransferVersion(gfx::ColorSpace::TransferID t, uint32_t v) : transfer(t), version(v) {}
 141  };
 142
 143  struct PrimaryVersion {
 144    gfx::ColorSpace::PrimaryID primary;
 145    uint32_t version;
 146 +  PrimaryVersion(gfx::ColorSpace::PrimaryID p, uint32_t v) : primary(p), version(v) {}
 147  };
 148
 149  struct MatrixVersion {
 150    gfx::ColorSpace::MatrixID matrix;
 151    uint32_t version;
 152 +  MatrixVersion(gfx::ColorSpace::MatrixID m, uint32_t v) : matrix(m), version(v) {}
 153  };
 154
 155  struct RangeVersion {
 156    gfx::ColorSpace::RangeID range;
 157    uint32_t version;
 158 +  RangeVersion(gfx::ColorSpace::RangeID r, uint32_t v) : range(r), version(v) {}
 159  };
 160
 161  // A map from the zcr_color_manager_v1 chromaticity_names enum values
 162 --
 163 2.42.1
 164