Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2023-09-20 13:23:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new.16627 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium" Wed Sep 20 13:23:47 2023 rev:397 rq:1111802 version:117.0.5938.88 Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-09-12 21:04:35.239822323 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.16627/chromium.changes 2023-09-20 13:26:25.256694082 +0200 @@ -1,0 +2,37 @@ +Sun Sep 17 11:47:10 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- Chromium 117.0.5938.88 (boo#1215279) + * CVE-2023-4900: Inappropriate implementation in Custom Tabs + * CVE-2023-4901: Inappropriate implementation in Prompts + * CVE-2023-4902: Inappropriate implementation in Input + * CVE-2023-4903: Inappropriate implementation in Custom Mobile Tabs + * CVE-2023-4904: Insufficient policy enforcement in Downloads + * CVE-2023-4905: Inappropriate implementation in Prompts + * CVE-2023-4906: Insufficient policy enforcement in Autofill + * CVE-2023-4907: Inappropriate implementation in Intents + * CVE-2023-4908: Inappropriate implementation in Picture in Picture + * CVE-2023-4909: Inappropriate implementation in Interstitials +- drop patches: + * chromium-100-InMilliseconds-constexpr.patch + * chromium-115-Qt-moc-version.patch + * chromium-116-profile-view-utils-vector-include.patch + * chromium-116-blink-variant-include.patch + * chromium-116-abseil-limits-include.patch + * chromium-116-lp155-constuctors.patch + * chromium-115-workaround_clang_bug-structured_binding.patch + * chromium-115-emplace_back_on_vector-c++20.patch +- add patches: + * chromium-117-blink-BUILD-mnemonic.patch + * chromium-117-includes.patch + * chromium-117-lp155-constructors.patch + * chromium-117-string-convert.patch + * chromium-117-lp155-typename.patch + * chromium-117-workaround_clang_bug-structured_binding.patch + * chromium-117-emplace_back_on_vector-c++20.patch + +------------------------------------------------------------------- +Wed Sep 13 20:04:46 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- CVE-2023-4863: build with the bundled library on Leap (boo#1215231) + +------------------------------------------------------------------- Old: ---- chromium-100-InMilliseconds-constexpr.patch chromium-115-Qt-moc-version.patch chromium-115-emplace_back_on_vector-c++20.patch chromium-115-workaround_clang_bug-structured_binding.patch chromium-116-abseil-limits-include.patch chromium-116-blink-variant-include.patch chromium-116-lp155-constuctors.patch chromium-116-profile-view-utils-vector-include.patch chromium-116.0.5845.187.tar.xz New: ---- chromium-117-blink-BUILD-mnemonic.patch chromium-117-emplace_back_on_vector-c++20.patch chromium-117-includes.patch chromium-117-lp155-constructors.patch chromium-117-lp155-typename.patch chromium-117-string-convert.patch chromium-117-workaround_clang_bug-structured_binding.patch chromium-117.0.5938.88.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.261303282 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.265303425 +0200 @@ -55,8 +55,10 @@ %define gcc_version 12 %if 0%{?suse_version} < 1699 %bcond_with system_re2 +%bcond_with system_webp %else %bcond_without system_re2 +%bcond_without system_webp %endif %bcond_with is_beta # CHANNEL SWITCH %bcond_with system_avif @@ -83,7 +85,7 @@ %define n_suffix %{nil} %endif Name: chromium%{n_suffix} -Version: 116.0.5845.187 +Version: 117.0.5938.88 Release: 0 Summary: Google's open source browser project License: BSD-3-Clause AND LGPL-2.1-or-later @@ -119,7 +121,6 @@ Patch62: chromium-93-ffmpeg-4.4.patch Patch68: chromium-94-ffmpeg-roll.patch Patch87: chromium-98-gtk4-build.patch -Patch90: chromium-100-InMilliseconds-constexpr.patch Patch98: chromium-102-regex_pattern-array.patch # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding Patch202: chromium-prop-codecs.patch @@ -130,18 +131,18 @@ Patch211: gcc13-fix.patch Patch214: chromium-113-webview-namespace.patch Patch215: chromium-113-webauth-include-variant.patch -Patch217: chromium-115-workaround_clang_bug-structured_binding.patch +Patch217: chromium-117-workaround_clang_bug-structured_binding.patch Patch218: chromium-114-lld-argument.patch Patch221: chromium-115-lp155-typename.patch -Patch222: chromium-115-Qt-moc-version.patch -Patch223: chromium-115-emplace_back_on_vector-c++20.patch +Patch223: chromium-117-emplace_back_on_vector-c++20.patch Patch224: chromium-115-compiler-SkColor4f.patch -Patch227: chromium-116-profile-view-utils-vector-include.patch -Patch228: chromium-116-blink-variant-include.patch Patch229: chromium-116-lp155-url_load_stats-size-t.patch -Patch231: chromium-116-abseil-limits-include.patch Patch232: chromium-116-lp155-typenames.patch -Patch237: chromium-116-lp155-constuctors.patch +Patch237: chromium-117-lp155-constructors.patch +Patch238: chromium-117-blink-BUILD-mnemonic.patch +Patch239: chromium-117-includes.patch +Patch240: chromium-117-string-convert.patch +Patch241: chromium-117-lp155-typename.patch BuildRequires: (python3 >= 3.7 or python3-dataclasses) BuildRequires: (python3-importlib-metadata if python3-base < 3.8) BuildRequires: SDL-devel @@ -211,7 +212,6 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libva) -BuildRequires: pkgconfig(libwebp) >= 0.4.0 BuildRequires: pkgconfig(libxml-2.0) >= 2.9.5 BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(menu) @@ -329,6 +329,9 @@ %if %{with system_re2} BuildRequires: pkgconfig(re2) >= 11 %endif +%if %{with system_webp} +BuildRequires: pkgconfig(libwebp) >= 0.4.0 +%endif %if %{with clang} %if 0%{?suse_version} < 1550 BuildRequires: clang%{llvm_version} @@ -406,11 +409,6 @@ ln -sfn %{_bindir}/$PYTHON $HOME/bin/python export PATH="$HOME/bin/:$PATH" -# qt -%if %{with qt6} -ln -s %{?_qt6_libexecdir}/moc $HOME/bin/moc-qt6 -%endif - # use our wrapper rm chrome/installer/linux/common/wrapper cp %{SOURCE106} chrome/installer/linux/common/wrapper @@ -442,7 +440,6 @@ third_party/angle/src/common/third_party/xxhash third_party/angle/src/third_party/ceval third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/systeminfo third_party/angle/src/third_party/volk third_party/apple_apsl third_party/axe-core @@ -499,6 +496,7 @@ third_party/devtools-frontend/src/front_end/third_party/marked third_party/devtools-frontend/src/front_end/third_party/puppeteer third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt + third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs third_party/devtools-frontend/src/front_end/third_party/wasmparser third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n third_party/devtools-frontend/src/third_party @@ -577,7 +575,6 @@ third_party/pdfium/third_party/lcms third_party/pdfium/third_party/libopenjpeg third_party/pdfium/third_party/libtiff - third_party/pdfium/third_party/skia_shared third_party/perfetto third_party/perfetto/protos/third_party/chromium third_party/pffft @@ -637,6 +634,7 @@ third_party/xcbproto third_party/xnnpack third_party/zlib/google + third_party/zstd third_party/zxcvbn-cpp url/third_party/mozilla v8/src/third_party/siphash @@ -684,6 +682,9 @@ %if !%{with system_re2} keeplibs+=( third_party/re2 ) %endif +%if !%{with system_webp} +keeplibs+=( third_party/libwebp ) +%endif build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove # GN sets lto on its own and we need just ldflag options, not cflags @@ -766,7 +767,6 @@ libjpeg libpng libusb - libwebp libxml libxslt opus @@ -799,6 +799,9 @@ %if %{with system_re2} gn_system_libraries+=( re2 ) %endif +%if %{with system_webp} +gn_system_libraries+=( libwebp ) +%endif build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries[@]} # Create the configuration for GN @@ -836,7 +839,6 @@ myconf_gn+=" use_allocator_shim=true" myconf_gn+=" use_partition_alloc=true" myconf_gn+=" disable_fieldtrial_testing_config=true" -myconf_gn+=" use_gnome_keyring=false" myconf_gn+=" use_unofficial_version_number=false" myconf_gn+=" use_vaapi=true" myconf_gn+=" use_sysroot=false" @@ -853,9 +855,12 @@ %endif %if %{without qt} myconf_gn+=" use_qt=false" +%else +myconf_gn+=" moc_qt5_path=\"%{_libqt5_bindir}\"" %endif %if %{with qt6} myconf_gn+=" use_qt6=true" +myconf_gn+=" moc_qt6_path=\"%{?_qt6_libexecdir}\"" %endif # See dependency logic in third_party/BUILD.gn %if %{with system_harfbuzz} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.333305861 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.337306005 +0200 @@ -2,24 +2,14 @@ <constraints> <hardware> <disk> - <size unit="G">21</size> + <size unit="G">30</size> </disk> <physicalmemory> - <size unit="G">8</size> + <size unit="G">14</size> </physicalmemory> </hardware> <overwrite> <conditions> - <arch>x86_64</arch> - </conditions> - <hardware> - <memory> - <size unit="G">24</size> - </memory> - </hardware> - </overwrite> - <overwrite> - <conditions> <arch>aarch64</arch> </conditions> <hardware> @@ -27,7 +17,7 @@ <flag>asimdrdm</flag> </cpu> <memory> - <size unit="G">12</size> + <size unit="G">11</size> </memory> </hardware> </overwrite> ++++++ chromium-116-lp155-url_load_stats-size-t.patch ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.381307581 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.381307581 +0200 @@ -1,9 +1,9 @@ -Index: chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h +Index: chromium-117.0.5938.22/components/bookmarks/common/url_load_stats.h =================================================================== ---- chromium-116.0.5845.50.orig/components/bookmarks/common/url_load_stats.h -+++ chromium-116.0.5845.50/components/bookmarks/common/url_load_stats.h -@@ -7,6 +7,7 @@ - +--- chromium-117.0.5938.22.orig/components/bookmarks/common/url_load_stats.h ++++ chromium-117.0.5938.22/components/bookmarks/common/url_load_stats.h +@@ -8,6 +8,7 @@ + #include <cstddef> #include <cstdint> #include <vector> +#include <cstddef> ++++++ chromium-117-blink-BUILD-mnemonic.patch ++++++ [ 332s] ERROR at //third_party/blink/renderer/core/BUILD.gn:1697:14: Assignment had no effect. [ 332s] mnemonic = "ELOC_PROTO" [ 332s] ^----------- [ 332s] You set the variable "mnemonic" here and it was unused before it went [ 332s] out of scope. [ 332s] See //BUILD.gn:1166:7: which caused the file to be included. [ 332s] "//third_party/blink/renderer/core:gen_files_for_web_tests", [ 332s] ^---------------------------------------------------------- Index: chromium-117.0.5938.22/third_party/blink/renderer/core/BUILD.gn =================================================================== --- chromium-117.0.5938.22.orig/third_party/blink/renderer/core/BUILD.gn +++ chromium-117.0.5938.22/third_party/blink/renderer/core/BUILD.gn @@ -1694,8 +1694,6 @@ action_foreach("element_locator_test_pro python_path_root = "${root_out_dir}/pyproto" python_path_proto = "${python_path_root}/third_party/blink/renderer/core/lcp_critical_path_predictor" - mnemonic = "ELOC_PROTO" - source_dir = "lcp_critical_path_predictor/test_proto" sources = rebase_path([ "lcp_image_id.asciipb" ], "", source_dir) ++++++ chromium-115-emplace_back_on_vector-c++20.patch -> chromium-117-emplace_back_on_vector-c++20.patch ++++++ --- /work/SRC/openSUSE:Factory/chromium/chromium-115-emplace_back_on_vector-c++20.patch 2023-07-24 18:26:52.806472144 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.16627/chromium-117-emplace_back_on_vector-c++20.patch 2023-09-20 13:25:17.310259862 +0200 @@ -19,3 +19,73 @@ } client_hints.full_version_list = std::move(full_version_list); +diff -up chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc +--- chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc.me 2023-08-15 21:34:58.922855428 +0200 ++++ chromium-116.0.5845.96/chrome/browser/content_settings/one_time_permission_provider.cc 2023-08-15 21:39:23.310434237 +0200 +@@ -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() = {setting_type, rule->primary_pattern, ++ rule->secondary_pattern}; + permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( + setting_type, + permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); +@@ -302,8 +302,8 @@ void OneTimePermissionProvider::DeleteEn + auto rule = rule_iterator->Next(); + 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); ++ patterns_to_delete.emplace_back() = { ++ content_setting_type, rule->primary_pattern, rule->secondary_pattern}; + permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( + content_setting_type, trigger_event); + } +diff -up chromium-117.0.5938.62/base/trace_event/trace_log.cc.me chromium-117.0.5938.62/base/trace_event/trace_log.cc +--- chromium-117.0.5938.62/base/trace_event/trace_log.cc.me 2023-09-13 20:14:42.441248781 +0200 ++++ chromium-117.0.5938.62/base/trace_event/trace_log.cc 2023-09-13 20:16:12.186638601 +0200 +@@ -2187,8 +2187,8 @@ void TraceLog::SetTraceBufferForTesting( + #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) + void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { + AutoLock lock(track_event_lock_); +- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, +- args.backend_type); ++ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config, ++ args.backend_type}; + } + + void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { +diff -up chromium-117.0.5938.62/content/browser/download/save_package.cc.me chromium-117.0.5938.62/content/browser/download/save_package.cc +--- chromium-117.0.5938.62/content/browser/download/save_package.cc.me 2023-09-15 12:02:43.866622591 +0200 ++++ chromium-117.0.5938.62/content/browser/download/save_package.cc 2023-09-15 12:03:58.715984511 +0200 +@@ -764,8 +764,8 @@ void SavePackage::Finish() { + if (download_) { + std::vector<download::DownloadSaveItemData::ItemInfo> files; + for (auto& item : saved_success_items_) { +- files.emplace_back(item.second->full_path(), item.second->url(), +- item.second->referrer().url); ++ files.emplace_back() = {item.second->full_path(), item.second->url(), ++ item.second->referrer().url}; + } + download::DownloadSaveItemData::AttachItemData(download_, std::move(files)); + } +diff -up chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me chromium-117.0.5938.62/ui/gtk/gtk_ui.cc +--- chromium-117.0.5938.62/ui/gtk/gtk_ui.cc.me 2023-09-15 20:29:42.626502343 +0200 ++++ chromium-117.0.5938.62/ui/gtk/gtk_ui.cc 2023-09-15 20:36:18.763091179 +0200 +@@ -955,11 +955,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi + GdkRectangle geometry; + gdk_monitor_get_geometry(monitor, &geometry); + int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); +- config.display_geometries.emplace_back( ++ config.display_geometries.emplace_back() = { + gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, + monitor_scale * geometry.width, + monitor_scale * geometry.height), +- monitor_scale * font_scale); ++ static_cast<float>(monitor_scale * font_scale)}; + } + return config; + } ++++++ chromium-117-includes.patch ++++++ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:58:27: warning: using integer absolute value function 'abs' when argument is of floating point type [-Wabsolute-value] [ 863s] double smallest_delta = abs(smallest_delta_hct.get_chroma() - chroma); [ 863s] ^ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:58:27: note: use function 'std::abs' instead [ 863s] double smallest_delta = abs(smallest_delta_hct.get_chroma() - chroma); [ 863s] ^~~ [ 863s] std::abs [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:70:9: error: use of undeclared identifier 'round' [ 863s] if (round(chroma) == round(smallest_delta_hct.get_chroma())) { [ 863s] ^ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:70:26: error: use of undeclared identifier 'round' [ 863s] if (round(chroma) == round(smallest_delta_hct.get_chroma())) { [ 863s] ^ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:74:28: warning: using integer absolute value function 'abs' when argument is of floating point type [-Wabsolute-value] [ 863s] double hct_add_delta = abs(hct_add.get_chroma() - chroma); [ 863s] ^ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:74:28: note: use function 'std::abs' instead [ 863s] double hct_add_delta = abs(hct_add.get_chroma() - chroma); [ 863s] ^~~ [ 863s] std::abs [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:80:33: warning: using integer absolute value function 'abs' when argument is of floating point type [-Wabsolute-value] [ 863s] double hct_subtract_delta = abs(hct_subtract.get_chroma() - chroma); [ 863s] ^ [ 863s] ../third_party/material_color_utilities/src/cpp/palettes/tones.cc:80:33: note: use function 'std::abs' instead [ 863s] double hct_subtract_delta = abs(hct_subtract.get_chroma() - chroma); [ 863s] ^~~ [ 863s] std::abs [ 863s] 3 warnings and 2 errors generated. Index: chromium-117.0.5938.22/third_party/material_color_utilities/src/cpp/palettes/tones.cc =================================================================== --- chromium-117.0.5938.22.orig/third_party/material_color_utilities/src/cpp/palettes/tones.cc +++ chromium-117.0.5938.22/third_party/material_color_utilities/src/cpp/palettes/tones.cc @@ -18,6 +18,7 @@ #include "cpp/cam/cam.h" #include "cpp/cam/hct.h" +#include <cmath> namespace material_color_utilities { [ 3262s] In file included from ../third_party/ipcz/src/ipcz/route_edge.cc:5: [ 3262s] In file included from ../third_party/ipcz/src/ipcz/route_edge.h:8: [ 3262s] ../third_party/ipcz/src/ipcz/router_link.h:73:34: error: no template named 'unique_ptr' in namespace 'std' [ 3262s] std::unique_ptr<Parcel> parcel) = 0; [ 3262s] ~~~~~^ [ 3262s] 1 error generated. Index: chromium-117.0.5938.22/third_party/ipcz/src/ipcz/router_link.h =================================================================== --- chromium-117.0.5938.22.orig/third_party/ipcz/src/ipcz/router_link.h +++ chromium-117.0.5938.22/third_party/ipcz/src/ipcz/router_link.h @@ -9,6 +9,7 @@ #include <functional> #include <string> #include <utility> +#include <memory> #include "ipcz/fragment_ref.h" #include "ipcz/link_type.h" ++++++ chromium-117-lp155-constructors.patch ++++++ 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_); diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc diff -up chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h --- chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h.me 2023-09-15 10:48:41.330294241 +0200 +++ chromium-117.0.5938.62/third_party/blink/renderer/platform/fonts/font_palette.h 2023-09-15 10:51:24.501324416 +0200 @@ -96,7 +96,7 @@ class PLATFORM_EXPORT FontPalette : publ Color::ColorSpace color_interpolation_space, absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) { return base::AdoptRef(new FontPalette( - start, end, NonNormalizedPercentages(start_percentage, end_percentage), + start, end, NonNormalizedPercentages{start_percentage, end_percentage}, normalized_percentage, alpha_multiplier, color_interpolation_space, hue_interpolation_method)); } @@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontPalette : publ double normalized_percentage) { double end_percentage = normalized_percentage * 100.0; double start_percentage = 100.0 - end_percentage; - return NonNormalizedPercentages(start_percentage, end_percentage); + return NonNormalizedPercentages{start_percentage, end_percentage}; } double GetAlphaMultiplier() const { diff -up chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc --- chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc.me 2023-09-15 12:17:35.664861257 +0200 +++ chromium-117.0.5938.62/content/browser/renderer_host/render_frame_host_impl.cc 2023-09-15 12:21:06.112694256 +0200 @@ -8509,7 +8509,7 @@ void RenderFrameHostImpl::SendFencedFram for (const blink::FencedFrame::ReportingDestination& destination : destinations) { SendFencedFrameReportingBeaconInternal( - DestinationEnumEvent(event_type, event_data), destination, + DestinationEnumEvent{event_type, event_data}, destination, /*from_renderer=*/true, attribution_reporting_runtime_features, GetFrameTreeNodeId()); } @@ -8545,7 +8545,7 @@ void RenderFrameHostImpl::SendFencedFram } SendFencedFrameReportingBeaconInternal( - DestinationURLEvent(destination_url), + DestinationURLEvent{destination_url}, blink::FencedFrame::ReportingDestination::kBuyer, /*from_renderer=*/true, attribution_reporting_runtime_features, GetFrameTreeNodeId()); @@ -8617,8 +8617,8 @@ void RenderFrameHostImpl::MaybeSendFence for (blink::FencedFrame::ReportingDestination destination : info->destinations) { initiator_rfh->SendFencedFrameReportingBeaconInternal( - DestinationEnumEvent(blink::kFencedFrameTopNavigationBeaconType, - info->data), + DestinationEnumEvent{blink::kFencedFrameTopNavigationBeaconType, + info->data}, destination, /*from_renderer=*/false, info->attribution_reporting_runtime_features, GetFrameTreeNodeId(), navigation_request.GetNavigationId()); diff -up chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc --- chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.me 2023-09-15 22:04:09.233356627 +0200 +++ chromium-117.0.5938.62/chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc 2023-09-15 22:05:44.126063992 +0200 @@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileA // TODO(crbug.com/1445072): Add actual domains with attribute names. profile_attributes->insert(std::make_pair( "supported.test", - SAMLProfileAttributes("placeholderName", "placeholderDomain", - "placeholderToken"))); + SAMLProfileAttributes{"placeholderName", "placeholderDomain", + "placeholderToken"})); // Extract domains and attributes from the command line switch. const base::CommandLine& command_line = ++++++ chromium-117-lp155-typename.patch ++++++ diff -up chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h --- chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h.me 2023-09-15 10:22:51.889698402 +0200 +++ chromium-117.0.5938.62/components/optimization_guide/core/tflite_model_executor.h 2023-09-15 10:28:26.702716224 +0200 @@ -234,7 +234,7 @@ class TFLiteModelExecutor : public Model // Starts the synchronous execution of the model. Returns model outputs. // Model needs to be loaded. Synchronous calls do not load or unload model. std::vector<absl::optional<OutputType>> SendForBatchExecutionSync( - ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) + typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -389,7 +389,7 @@ class TFLiteModelExecutor : public Model // executes it on the model execution thread. void LoadModelFileAndBatchExecute( BatchExecutionCallback callback_on_complete, - ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { + typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -406,7 +406,7 @@ class TFLiteModelExecutor : public Model // Batch executes the loaded model for inputs. void BatchExecuteLoadedModel( - ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, + typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, std::vector<absl::optional<OutputType>>* outputs) { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -466,7 +466,7 @@ class TFLiteModelExecutor : public Model // Unloads the model if needed. void BatchExecuteLoadedModelAndRunCallback( BatchExecutionCallback callback_on_complete, - ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, + typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs, ExecutionStatus execution_status) { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc --- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc.me 2023-09-15 17:20:22.550657586 +0200 +++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.cc 2023-09-15 17:24:11.396716734 +0200 @@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; - void Start(ProtoFetcher<Response>::Callback callback) override { + void Start(typename ProtoFetcher<Response>::Callback callback) override { callback_ = std::move(callback); Retry(); } @@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public } // Client callback. - ProtoFetcher<Response>::Callback callback_; + typename ProtoFetcher<Response>::Callback callback_; // Retry controls. base::OneShotTimer timer_; @@ -578,7 +578,7 @@ ParallelFetchManager<Request, Response>: template <typename Request, typename Response> void ParallelFetchManager<Request, Response>::Fetch( const Request& request, - Fetcher::Callback callback) { + typename Fetcher::Callback callback) { CHECK(callback) << "Use base::DoNothing() instead of empty callback."; KeyType key = requests_in_flight_.Add(MakeFetcher(request)); requests_in_flight_.Lookup(key)->Start( diff -up chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h --- chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h.me 2023-09-15 17:20:56.540460391 +0200 +++ chromium-117.0.5938.62/components/supervised_user/core/browser/proto_fetcher.h 2023-09-15 17:22:18.246237817 +0200 @@ -165,10 +165,10 @@ class ParallelFetchManager { // Starts the fetch. Underlying fetcher is stored internally, and will be // cleaned up after finish or when this manager is destroyed. - void Fetch(const Request& request, Fetcher::Callback callback); + void Fetch(const Request& request, typename Fetcher::Callback callback); private: - using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType; + using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType; // Remove fetcher under key from requests_in_flight_. void Remove(KeyType key); ++++++ chromium-117-string-convert.patch ++++++ diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.cc.me chromium-117.0.5938.62/net/dns/host_resolver_cache.cc diff -up chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me chromium-117.0.5938.62/net/dns/host_resolver_cache.h --- chromium-117.0.5938.62/net/dns/host_resolver_cache.h.me 2023-09-14 15:21:24.632965004 +0200 +++ chromium-117.0.5938.62/net/dns/host_resolver_cache.h 2023-09-15 09:15:48.511300845 +0200 @@ -143,12 +143,14 @@ class NET_EXPORT HostResolverCache final } bool operator()(const Key& lhs, const KeyRef& rhs) const { + const std::string rhs_domain_name{rhs.domain_name}; return std::tie(lhs.domain_name, lhs.network_anonymization_key) < - std::tie(rhs.domain_name, *rhs.network_anonymization_key); + std::tie(rhs_domain_name, *rhs.network_anonymization_key); } bool operator()(const KeyRef& lhs, const Key& rhs) const { - return std::tie(lhs.domain_name, *lhs.network_anonymization_key) < + const std::string lhs_domain_name{lhs.domain_name}; + return std::tie(lhs_domain_name, *lhs.network_anonymization_key) < std::tie(rhs.domain_name, rhs.network_anonymization_key); } }; ++++++ chromium-115-workaround_clang_bug-structured_binding.patch -> chromium-117-workaround_clang_bug-structured_binding.patch ++++++ --- /work/SRC/openSUSE:Factory/chromium/chromium-115-workaround_clang_bug-structured_binding.patch 2023-07-24 18:26:52.862472473 +0200 +++ /work/SRC/openSUSE:Factory/.chromium.new.16627/chromium-117-workaround_clang_bug-structured_binding.patch 2023-09-20 13:25:17.386262585 +0200 @@ -15,18 +15,6 @@ diff -up chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc --- chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-06-07 21:48:41.000000000 +0200 +++ chromium-115.0.5790.24/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-06-17 18:47:06.001403966 +0200 -@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori - : BuildGridSizingTree(&oof_children); - - LayoutUnit intrinsic_block_size; -- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData(); -+ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData(); -+ auto& grid_items = g_i; -+ auto& layout_data = l_d; -+ auto& tree_size = t_s; - - if (IsBreakInside(BreakToken())) { - // TODO(layout-dev): When we support variable inline-size fragments we'll @@ -655,8 +658,10 @@ NGGridSizingTree NGGridLayoutAlgorithm:: NGGridSizingTree sizing_tree; @@ -79,3 +67,43 @@ DCHECK(document_url.is_valid()); TRACE_EVENT1("ServiceWorker", +diff -up chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc +--- chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-09-15 13:03:00.787257048 +0200 ++++ chromium-117.0.5938.62/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-09-15 13:15:05.502706522 +0200 +@@ -3437,7 +3437,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte + DCHECK(out_row_break_between); + + const auto& container_space = ConstraintSpace(); +- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++ const auto& tree_size = t_s; + + const auto* cached_layout_subtree = container_space.GridLayoutSubtree(); + const auto container_writing_direction = +@@ -3601,7 +3604,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte + + // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. + const auto& constraint_space = ConstraintSpace(); +- const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); ++ const auto& [g_i, l_d, t_s] = sizing_tree.TreeRootData(); ++ const auto& grid_items = g_i; ++ const auto& layout_data = l_d; ++ const auto& tree_size =t_s; + + const auto* cached_layout_subtree = constraint_space.GridLayoutSubtree(); + const auto container_writing_direction = +diff -up chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc +--- chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc.me 2023-09-15 18:24:18.984133783 +0200 ++++ chromium-117.0.5938.62/chrome/browser/ui/autofill/chrome_autofill_client.cc 2023-09-15 18:28:50.420833595 +0200 +@@ -1100,7 +1100,8 @@ void ChromeAutofillClient::PropagateAuto + &renderer_form); + } + +- for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) { ++ for (const auto& [f_t, frame_forms] : renderer_forms_by_frame) { ++ auto& frame_token = f_t; + // Attempt to find the RFH with this `frame_token`. + content::RenderFrameHost* rfh = nullptr; + GetWebContents().ForEachRenderFrameHost( ++++++ chromium-116.0.5845.187.tar.xz -> chromium-117.0.5938.88.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-116.0.5845.187.tar.xz /work/SRC/openSUSE:Factory/.chromium.new.16627/chromium-117.0.5938.88.tar.xz differ: char 15, line 1 ++++++ chromium-98-gtk4-build.patch ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.477311020 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.481311164 +0200 @@ -1,6 +1,8 @@ ---- a/ui/gtk/gsk.sigs -+++ b/ui/gtk/gsk.sigs -@@ -1,16 +1,16 @@ +Index: chromium-117.0.5938.62/ui/gtk/gsk.sigs +=================================================================== +--- chromium-117.0.5938.62.orig/ui/gtk/gsk.sigs ++++ chromium-117.0.5938.62/ui/gtk/gsk.sigs +@@ -1,17 +1,17 @@ -GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node); +GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node); void gsk_render_node_unref(GskRenderNode* node); @@ -32,26 +34,27 @@ +guint gsk_container_node_get_n_children(const GskRenderNode* node); +guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node); +GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node); ---- a/ui/gtk/gtk_util.cc -+++ b/ui/gtk/gtk_util.cc -@@ -705,7 +705,7 @@ - DCHECK(GtkCheckVersion(4)); - struct { - GskRenderNodeType node_type; -- GskRenderNode* (*get_child)(GskRenderNode*); -+ GskRenderNode* (*get_child)(const GskRenderNode*); - } constexpr simple_getters[] = { - {GSK_TRANSFORM_NODE, gsk_transform_node_get_child}, - {GSK_OPACITY_NODE, gsk_opacity_node_get_child}, -@@ -719,8 +719,8 @@ - }; - struct { - GskRenderNodeType node_type; -- guint (*get_n_children)(GskRenderNode*); -- GskRenderNode* (*get_child)(GskRenderNode*, guint); -+ guint (*get_n_children)(const GskRenderNode*); -+ GskRenderNode* (*get_child)(const GskRenderNode*, guint); - } constexpr container_getters[] = { - {GSK_CONTAINER_NODE, gsk_container_node_get_n_children, - gsk_container_node_get_child}, + float gsk_opacity_node_get_opacity(const GskRenderNode* node); +Index: chromium-117.0.5938.62/ui/gtk/gtk_util.cc +=================================================================== +--- chromium-117.0.5938.62.orig/ui/gtk/gtk_util.cc ++++ chromium-117.0.5938.62/ui/gtk/gtk_util.cc +@@ -38,7 +38,7 @@ namespace { + + const char kAuraTransientParent[] = "aura-transient-parent"; + +-GskRenderNode* GetRenderNodeChild(GskRenderNode* node) { ++GskRenderNode* GetRenderNodeChild(const GskRenderNode* node) { + switch (gsk_render_node_get_node_type(node)) { + case GSK_TRANSFORM_NODE: + return gsk_transform_node_get_child(node); +@@ -66,7 +66,7 @@ GskRenderNode* GetRenderNodeChild(GskRen + std::vector<GskRenderNode*> GetRenderNodeChildren(GskRenderNode* node) { + std::vector<GskRenderNode*> result; + size_t n_children = 0; +- GskRenderNode* (*get_child)(GskRenderNode*, guint) = nullptr; ++ GskRenderNode* (*get_child)(const GskRenderNode*, guint) = nullptr; + switch (gsk_render_node_get_node_type(node)) { + case GSK_CONTAINER_NODE: + n_children = gsk_container_node_get_n_children(node); ++++++ chromium-norar.patch ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.521312597 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.521312597 +0200 @@ -1,7 +1,7 @@ -Index: chromium-115.0.5790.32/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +Index: chromium-117.0.5938.22/chrome/browser/safe_browsing/download_protection/file_analyzer.cc =================================================================== ---- chromium-115.0.5790.32.orig/chrome/browser/safe_browsing/download_protection/file_analyzer.cc -+++ chromium-115.0.5790.32/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +--- chromium-117.0.5938.22.orig/chrome/browser/safe_browsing/download_protection/file_analyzer.cc ++++ chromium-117.0.5938.22/chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -77,8 +77,6 @@ void FileAnalyzer::Start(const base::Fil if (inspection_type == DownloadFileType::ZIP) { @@ -11,10 +11,10 @@ #if BUILDFLAG(IS_MAC) } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); -Index: chromium-115.0.5790.32/chrome/utility/safe_browsing/archive_analyzer.cc +Index: chromium-117.0.5938.22/chrome/utility/safe_browsing/archive_analyzer.cc =================================================================== ---- chromium-115.0.5790.32.orig/chrome/utility/safe_browsing/archive_analyzer.cc -+++ chromium-115.0.5790.32/chrome/utility/safe_browsing/archive_analyzer.cc +--- chromium-117.0.5938.22.orig/chrome/utility/safe_browsing/archive_analyzer.cc ++++ chromium-117.0.5938.22/chrome/utility/safe_browsing/archive_analyzer.cc @@ -8,7 +8,6 @@ #include "build/build_config.h" #include "build/buildflag.h" @@ -34,11 +34,11 @@ return std::make_unique<ZipAnalyzer>(); } else if (file_type == DownloadFileType::SEVEN_ZIP) { return std::make_unique<SevenZipAnalyzer>(); -Index: chromium-115.0.5790.32/chrome/common/safe_browsing/BUILD.gn +Index: chromium-117.0.5938.22/chrome/common/safe_browsing/BUILD.gn =================================================================== ---- chromium-115.0.5790.32.orig/chrome/common/safe_browsing/BUILD.gn -+++ chromium-115.0.5790.32/chrome/common/safe_browsing/BUILD.gn -@@ -134,7 +134,6 @@ source_set("safe_browsing") { +--- chromium-117.0.5938.22.orig/chrome/common/safe_browsing/BUILD.gn ++++ chromium-117.0.5938.22/chrome/common/safe_browsing/BUILD.gn +@@ -137,7 +137,6 @@ source_set("safe_browsing") { "//components/safe_browsing/content/common:file_type_policies", "//components/safe_browsing/core/common", "//third_party/lzma_sdk/google:seven_zip_reader", @@ -46,11 +46,11 @@ ] public_deps = [ -Index: chromium-115.0.5790.32/chrome/services/file_util/safe_archive_analyzer.cc +Index: chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.cc =================================================================== ---- chromium-115.0.5790.32.orig/chrome/services/file_util/safe_archive_analyzer.cc -+++ chromium-115.0.5790.32/chrome/services/file_util/safe_archive_analyzer.cc -@@ -69,6 +69,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile +--- chromium-117.0.5938.22.orig/chrome/services/file_util/safe_archive_analyzer.cc ++++ chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.cc +@@ -73,6 +73,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile base::File rar_file, mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter, AnalyzeRarFileCallback callback) { @@ -58,8 +58,8 @@ DCHECK(rar_file.IsValid()); temp_file_getter_.Bind(std::move(temp_file_getter)); callback_ = std::move(callback); -@@ -84,6 +85,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile - rar_analyzer_.Analyze(std::move(rar_file), base::FilePath(), +@@ -91,6 +92,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile + /*password=*/absl::nullopt, std::move(analysis_finished_callback), std::move(temp_file_getter_callback), &results_); +#else @@ -68,10 +68,10 @@ } void SafeArchiveAnalyzer::AnalyzeSevenZipFile( -Index: chromium-115.0.5790.32/chrome/services/file_util/safe_archive_analyzer.h +Index: chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.h =================================================================== ---- chromium-115.0.5790.32.orig/chrome/services/file_util/safe_archive_analyzer.h -+++ chromium-115.0.5790.32/chrome/services/file_util/safe_archive_analyzer.h +--- chromium-117.0.5938.22.orig/chrome/services/file_util/safe_archive_analyzer.h ++++ chromium-117.0.5938.22/chrome/services/file_util/safe_archive_analyzer.h @@ -7,7 +7,6 @@ #include "chrome/common/safe_browsing/archive_analyzer_results.h" @@ -80,7 +80,7 @@ #include "chrome/utility/safe_browsing/seven_zip_analyzer.h" #include "chrome/utility/safe_browsing/zip_analyzer.h" #include "mojo/public/cpp/bindings/remote.h" -@@ -63,7 +62,6 @@ class SafeArchiveAnalyzer : public chrom +@@ -65,7 +64,6 @@ class SafeArchiveAnalyzer : public chrom void Timeout(); safe_browsing::ZipAnalyzer zip_analyzer_; @@ -88,10 +88,10 @@ safe_browsing::SevenZipAnalyzer seven_zip_analyzer_; #if BUILDFLAG(IS_MAC) safe_browsing::dmg::DMGAnalyzer dmg_analyzer_; -Index: chromium-115.0.5790.32/chrome/utility/safe_browsing/BUILD.gn +Index: chromium-117.0.5938.22/chrome/utility/safe_browsing/BUILD.gn =================================================================== ---- chromium-115.0.5790.32.orig/chrome/utility/safe_browsing/BUILD.gn -+++ chromium-115.0.5790.32/chrome/utility/safe_browsing/BUILD.gn +--- chromium-117.0.5938.22.orig/chrome/utility/safe_browsing/BUILD.gn ++++ chromium-117.0.5938.22/chrome/utility/safe_browsing/BUILD.gn @@ -31,8 +31,6 @@ source_set("safe_browsing") { sources = [ "archive_analyzer.cc", @@ -106,7 +106,7 @@ "//components/safe_browsing/core/common", "//third_party/lzma_sdk/google:seven_zip_reader", - "//third_party/unrar:unrar", + "//third_party/zlib", ] - if (is_linux) { ++++++ gcc13-fix.patch ++++++ --- /var/tmp/diff_new_pack.9EjQjC/_old 2023-09-20 13:26:42.557313887 +0200 +++ /var/tmp/diff_new_pack.9EjQjC/_new 2023-09-20 13:26:42.557313887 +0200 @@ -1,7 +1,7 @@ -Index: chromium-116.0.5845.42/base/check_op.h +Index: chromium-117.0.5938.22/base/check_op.h =================================================================== ---- chromium-116.0.5845.42.orig/base/check_op.h -+++ chromium-116.0.5845.42/base/check_op.h +--- chromium-117.0.5938.22.orig/base/check_op.h ++++ chromium-117.0.5938.22/base/check_op.h @@ -5,6 +5,7 @@ #ifndef BASE_CHECK_OP_H_ #define BASE_CHECK_OP_H_ @@ -9,11 +9,11 @@ +#include <cstdint> #include <cstddef> #include <string> - #include <type_traits> -Index: chromium-116.0.5845.42/base/debug/profiler.h + #include <string_view> +Index: chromium-117.0.5938.22/base/debug/profiler.h =================================================================== ---- chromium-116.0.5845.42.orig/base/debug/profiler.h -+++ chromium-116.0.5845.42/base/debug/profiler.h +--- chromium-117.0.5938.22.orig/base/debug/profiler.h ++++ chromium-117.0.5938.22/base/debug/profiler.h @@ -8,6 +8,7 @@ #include <stddef.h> #include <stdint.h> @@ -22,10 +22,10 @@ #include <string> #include "base/base_export.h" -Index: chromium-116.0.5845.42/gpu/config/gpu_feature_info.h +Index: chromium-117.0.5938.22/gpu/config/gpu_feature_info.h =================================================================== ---- chromium-116.0.5845.42.orig/gpu/config/gpu_feature_info.h -+++ chromium-116.0.5845.42/gpu/config/gpu_feature_info.h +--- chromium-117.0.5938.22.orig/gpu/config/gpu_feature_info.h ++++ chromium-117.0.5938.22/gpu/config/gpu_feature_info.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -34,10 +34,10 @@ #include <string> #include <vector> -Index: chromium-116.0.5845.42/net/base/net_export.h +Index: chromium-117.0.5938.22/net/base/net_export.h =================================================================== ---- chromium-116.0.5845.42.orig/net/base/net_export.h -+++ chromium-116.0.5845.42/net/base/net_export.h +--- chromium-117.0.5938.22.orig/net/base/net_export.h ++++ chromium-117.0.5938.22/net/base/net_export.h @@ -5,6 +5,8 @@ #ifndef NET_BASE_NET_EXPORT_H_ #define NET_BASE_NET_EXPORT_H_ @@ -47,10 +47,10 @@ // Defines NET_EXPORT so that functionality implemented by the net module can // be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to // access features not intended to be used directly by real consumers. -Index: chromium-116.0.5845.42/sandbox/linux/syscall_broker/broker_file_permission.h +Index: chromium-117.0.5938.22/sandbox/linux/syscall_broker/broker_file_permission.h =================================================================== ---- chromium-116.0.5845.42.orig/sandbox/linux/syscall_broker/broker_file_permission.h -+++ chromium-116.0.5845.42/sandbox/linux/syscall_broker/broker_file_permission.h +--- chromium-117.0.5938.22.orig/sandbox/linux/syscall_broker/broker_file_permission.h ++++ chromium-117.0.5938.22/sandbox/linux/syscall_broker/broker_file_permission.h @@ -5,6 +5,7 @@ #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ @@ -59,10 +59,10 @@ #include <bitset> #include <cstdint> #include <string> -Index: chromium-116.0.5845.42/third_party/abseil-cpp/absl/strings/string_view.h +Index: chromium-117.0.5938.22/third_party/abseil-cpp/absl/strings/string_view.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/abseil-cpp/absl/strings/string_view.h -+++ chromium-116.0.5845.42/third_party/abseil-cpp/absl/strings/string_view.h +--- chromium-117.0.5938.22.orig/third_party/abseil-cpp/absl/strings/string_view.h ++++ chromium-117.0.5938.22/third_party/abseil-cpp/absl/strings/string_view.h @@ -27,6 +27,7 @@ #ifndef ABSL_STRINGS_STRING_VIEW_H_ #define ABSL_STRINGS_STRING_VIEW_H_ @@ -71,10 +71,10 @@ #include <algorithm> #include <cassert> #include <cstddef> -Index: chromium-116.0.5845.42/third_party/angle/include/GLSLANG/ShaderVars.h +Index: chromium-117.0.5938.22/third_party/angle/include/GLSLANG/ShaderVars.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/angle/include/GLSLANG/ShaderVars.h -+++ chromium-116.0.5845.42/third_party/angle/include/GLSLANG/ShaderVars.h +--- chromium-117.0.5938.22.orig/third_party/angle/include/GLSLANG/ShaderVars.h ++++ chromium-117.0.5938.22/third_party/angle/include/GLSLANG/ShaderVars.h @@ -10,6 +10,7 @@ #ifndef GLSLANG_SHADERVARS_H_ #define GLSLANG_SHADERVARS_H_ @@ -83,10 +83,10 @@ #include <algorithm> #include <array> #include <cstdint> -Index: chromium-116.0.5845.42/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h +Index: chromium-117.0.5938.22/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -+++ chromium-116.0.5845.42/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h +--- chromium-117.0.5938.22.orig/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h ++++ chromium-117.0.5938.22/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -95,22 +95,10 @@ #include <array> #include <cstdint> #include <functional> -Index: chromium-116.0.5845.42/third_party/dawn/src/tint/reader/spirv/namer.h -=================================================================== ---- chromium-116.0.5845.42.orig/third_party/dawn/src/tint/reader/spirv/namer.h -+++ chromium-116.0.5845.42/third_party/dawn/src/tint/reader/spirv/namer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_SPIRV_NAMER_H_ - #define SRC_TINT_READER_SPIRV_NAMER_H_ - -+#include <cstdint> - #include <string> - #include <unordered_map> - #include <vector> -Index: chromium-116.0.5845.42/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h +Index: chromium-117.0.5938.22/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h -+++ chromium-116.0.5845.42/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h +--- chromium-117.0.5938.22.orig/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h ++++ chromium-117.0.5938.22/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -119,10 +107,10 @@ #include <functional> #include <map> #include <set> -Index: chromium-116.0.5845.42/third_party/swiftshader/src/System/LRUCache.hpp +Index: chromium-117.0.5938.22/third_party/swiftshader/src/System/LRUCache.hpp =================================================================== ---- chromium-116.0.5845.42.orig/third_party/swiftshader/src/System/LRUCache.hpp -+++ chromium-116.0.5845.42/third_party/swiftshader/src/System/LRUCache.hpp +--- chromium-117.0.5938.22.orig/third_party/swiftshader/src/System/LRUCache.hpp ++++ chromium-117.0.5938.22/third_party/swiftshader/src/System/LRUCache.hpp @@ -17,6 +17,7 @@ #include "System/Debug.hpp" @@ -131,10 +119,10 @@ #include <cstddef> #include <cstdint> #include <functional> -Index: chromium-116.0.5845.42/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +Index: chromium-117.0.5938.22/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -+++ chromium-116.0.5845.42/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +--- chromium-117.0.5938.22.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h ++++ chromium-117.0.5938.22/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -2388,6 +2388,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV #ifdef VMA_IMPLEMENTATION #undef VMA_IMPLEMENTATION @@ -143,10 +131,10 @@ #include <cstdint> #include <cstdlib> #include <cstring> -Index: chromium-116.0.5845.42/ui/gfx/geometry/linear_gradient.h +Index: chromium-117.0.5938.22/ui/gfx/geometry/linear_gradient.h =================================================================== ---- chromium-116.0.5845.42.orig/ui/gfx/geometry/linear_gradient.h -+++ chromium-116.0.5845.42/ui/gfx/geometry/linear_gradient.h +--- chromium-117.0.5938.22.orig/ui/gfx/geometry/linear_gradient.h ++++ chromium-117.0.5938.22/ui/gfx/geometry/linear_gradient.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -155,10 +143,10 @@ #include <array> #include <cstddef> #include <cstdint> -Index: chromium-116.0.5845.42/third_party/ruy/src/ruy/profiler/instrumentation.h +Index: chromium-117.0.5938.22/third_party/ruy/src/ruy/profiler/instrumentation.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/ruy/src/ruy/profiler/instrumentation.h -+++ chromium-116.0.5845.42/third_party/ruy/src/ruy/profiler/instrumentation.h +--- chromium-117.0.5938.22.orig/third_party/ruy/src/ruy/profiler/instrumentation.h ++++ chromium-117.0.5938.22/third_party/ruy/src/ruy/profiler/instrumentation.h @@ -17,6 +17,7 @@ limitations under the License. #define RUY_RUY_PROFILER_INSTRUMENTATION_H_ @@ -167,10 +155,10 @@ #include <cstdio> #include <mutex> #include <vector> -Index: chromium-116.0.5845.42/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h +Index: chromium-117.0.5938.22/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h -+++ chromium-116.0.5845.42/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h +--- chromium-117.0.5938.22.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h ++++ chromium-117.0.5938.22/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h @@ -31,6 +31,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ @@ -179,10 +167,10 @@ #include <complex> #include <deque> #include <vector> -Index: chromium-116.0.5845.42/base/containers/flat_map.h +Index: chromium-117.0.5938.22/base/containers/flat_map.h =================================================================== ---- chromium-116.0.5845.42.orig/base/containers/flat_map.h -+++ chromium-116.0.5845.42/base/containers/flat_map.h +--- chromium-117.0.5938.22.orig/base/containers/flat_map.h ++++ chromium-117.0.5938.22/base/containers/flat_map.h @@ -5,6 +5,7 @@ #ifndef BASE_CONTAINERS_FLAT_MAP_H_ #define BASE_CONTAINERS_FLAT_MAP_H_ @@ -190,11 +178,11 @@ +#include <cstdint> #include <functional> #include <tuple> - #include <utility> -Index: chromium-116.0.5845.42/components/crash/core/app/crash_reporter_client.h + #include <type_traits> +Index: chromium-117.0.5938.22/components/crash/core/app/crash_reporter_client.h =================================================================== ---- chromium-116.0.5845.42.orig/components/crash/core/app/crash_reporter_client.h -+++ chromium-116.0.5845.42/components/crash/core/app/crash_reporter_client.h +--- chromium-117.0.5938.22.orig/components/crash/core/app/crash_reporter_client.h ++++ chromium-117.0.5938.22/components/crash/core/app/crash_reporter_client.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -203,10 +191,10 @@ #include <string> #include "build/build_config.h" -Index: chromium-116.0.5845.42/ui/base/prediction/kalman_filter.h +Index: chromium-117.0.5938.22/ui/base/prediction/kalman_filter.h =================================================================== ---- chromium-116.0.5845.42.orig/ui/base/prediction/kalman_filter.h -+++ chromium-116.0.5845.42/ui/base/prediction/kalman_filter.h +--- chromium-117.0.5938.22.orig/ui/base/prediction/kalman_filter.h ++++ chromium-117.0.5938.22/ui/base/prediction/kalman_filter.h @@ -7,6 +7,8 @@ #include <stdint.h> @@ -216,10 +204,10 @@ #include "base/component_export.h" #include "ui/gfx/geometry/matrix3_f.h" -Index: chromium-116.0.5845.42/components/password_manager/core/browser/generation/password_generator.h +Index: chromium-117.0.5938.22/components/password_manager/core/browser/generation/password_generator.h =================================================================== ---- chromium-116.0.5845.42.orig/components/password_manager/core/browser/generation/password_generator.h -+++ chromium-116.0.5845.42/components/password_manager/core/browser/generation/password_generator.h +--- chromium-117.0.5938.22.orig/components/password_manager/core/browser/generation/password_generator.h ++++ chromium-117.0.5938.22/components/password_manager/core/browser/generation/password_generator.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -228,10 +216,10 @@ #include <string> -Index: chromium-116.0.5845.42/components/feature_engagement/internal/event_storage_validator.h +Index: chromium-117.0.5938.22/components/feature_engagement/internal/event_storage_validator.h =================================================================== ---- chromium-116.0.5845.42.orig/components/feature_engagement/internal/event_storage_validator.h -+++ chromium-116.0.5845.42/components/feature_engagement/internal/event_storage_validator.h +--- chromium-117.0.5938.22.orig/components/feature_engagement/internal/event_storage_validator.h ++++ chromium-117.0.5938.22/components/feature_engagement/internal/event_storage_validator.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -240,10 +228,10 @@ #include <string> namespace feature_engagement { -Index: chromium-116.0.5845.42/components/feature_engagement/internal/never_event_storage_validator.h +Index: chromium-117.0.5938.22/components/feature_engagement/internal/never_event_storage_validator.h =================================================================== ---- chromium-116.0.5845.42.orig/components/feature_engagement/internal/never_event_storage_validator.h -+++ chromium-116.0.5845.42/components/feature_engagement/internal/never_event_storage_validator.h +--- chromium-117.0.5938.22.orig/components/feature_engagement/internal/never_event_storage_validator.h ++++ chromium-117.0.5938.22/components/feature_engagement/internal/never_event_storage_validator.h @@ -5,6 +5,7 @@ #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ @@ -252,10 +240,10 @@ #include <string> #include "components/feature_engagement/internal/event_storage_validator.h" -Index: chromium-116.0.5845.42/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc +Index: chromium-117.0.5938.22/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc =================================================================== ---- chromium-116.0.5845.42.orig/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc -+++ chromium-116.0.5845.42/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc +--- chromium-117.0.5938.22.orig/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc ++++ chromium-117.0.5938.22/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc @@ -45,6 +45,7 @@ #include "llvm/Support/SaveAndRestore.h" #include "llvm/Support/raw_ostream.h" @@ -264,10 +252,10 @@ #include <string> #include <sysexits.h> #ifdef HAVE_BACKTRACE -Index: chromium-116.0.5845.42/chrome/browser/privacy_budget/encountered_surface_tracker.h +Index: chromium-117.0.5938.22/chrome/browser/privacy_budget/encountered_surface_tracker.h =================================================================== ---- chromium-116.0.5845.42.orig/chrome/browser/privacy_budget/encountered_surface_tracker.h -+++ chromium-116.0.5845.42/chrome/browser/privacy_budget/encountered_surface_tracker.h +--- chromium-117.0.5938.22.orig/chrome/browser/privacy_budget/encountered_surface_tracker.h ++++ chromium-117.0.5938.22/chrome/browser/privacy_budget/encountered_surface_tracker.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -276,10 +264,10 @@ #include <map> #include "base/containers/flat_set.h" -Index: chromium-116.0.5845.42/components/autofill/core/browser/autofill_ablation_study.h +Index: chromium-117.0.5938.22/components/autofill/core/browser/autofill_ablation_study.h =================================================================== ---- chromium-116.0.5845.42.orig/components/autofill/core/browser/autofill_ablation_study.h -+++ chromium-116.0.5845.42/components/autofill/core/browser/autofill_ablation_study.h +--- chromium-117.0.5938.22.orig/components/autofill/core/browser/autofill_ablation_study.h ++++ chromium-117.0.5938.22/components/autofill/core/browser/autofill_ablation_study.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -288,10 +276,10 @@ #include <string> class GURL; -Index: chromium-116.0.5845.42/components/omnibox/browser/on_device_head_model.h +Index: chromium-117.0.5938.22/components/omnibox/browser/on_device_head_model.h =================================================================== ---- chromium-116.0.5845.42.orig/components/omnibox/browser/on_device_head_model.h -+++ chromium-116.0.5845.42/components/omnibox/browser/on_device_head_model.h +--- chromium-117.0.5938.22.orig/components/omnibox/browser/on_device_head_model.h ++++ chromium-117.0.5938.22/components/omnibox/browser/on_device_head_model.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -300,10 +288,10 @@ #include <string> #include <utility> #include <vector> -Index: chromium-116.0.5845.42/components/payments/content/utility/fingerprint_parser.h +Index: chromium-117.0.5938.22/components/payments/content/utility/fingerprint_parser.h =================================================================== ---- chromium-116.0.5845.42.orig/components/payments/content/utility/fingerprint_parser.h -+++ chromium-116.0.5845.42/components/payments/content/utility/fingerprint_parser.h +--- chromium-117.0.5938.22.orig/components/payments/content/utility/fingerprint_parser.h ++++ chromium-117.0.5938.22/components/payments/content/utility/fingerprint_parser.h @@ -5,6 +5,7 @@ #ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ @@ -312,10 +300,10 @@ #include <stddef.h> #include <stdint.h> -Index: chromium-116.0.5845.42/pdf/document_attachment_info.h +Index: chromium-117.0.5938.22/pdf/document_attachment_info.h =================================================================== ---- chromium-116.0.5845.42.orig/pdf/document_attachment_info.h -+++ chromium-116.0.5845.42/pdf/document_attachment_info.h +--- chromium-117.0.5938.22.orig/pdf/document_attachment_info.h ++++ chromium-117.0.5938.22/pdf/document_attachment_info.h @@ -7,6 +7,7 @@ #include <stdint.h> @@ -324,10 +312,10 @@ #include <string> -Index: chromium-116.0.5845.42/third_party/pdfium/constants/annotation_flags.h +Index: chromium-117.0.5938.22/third_party/pdfium/constants/annotation_flags.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/pdfium/constants/annotation_flags.h -+++ chromium-116.0.5845.42/third_party/pdfium/constants/annotation_flags.h +--- chromium-117.0.5938.22.orig/third_party/pdfium/constants/annotation_flags.h ++++ chromium-117.0.5938.22/third_party/pdfium/constants/annotation_flags.h @@ -7,6 +7,8 @@ #include <stdint.h> @@ -337,10 +325,10 @@ namespace pdfium { namespace annotation_flags { -Index: chromium-116.0.5845.42/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h +Index: chromium-117.0.5938.22/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h =================================================================== ---- chromium-116.0.5845.42.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -+++ chromium-116.0.5845.42/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h +--- chromium-117.0.5938.22.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h ++++ chromium-117.0.5938.22/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h @@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. @@ -349,10 +337,10 @@ static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) { snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num)); -Index: chromium-116.0.5845.42/chrome/browser/webauthn/authenticator_request_dialog_model.h +Index: chromium-117.0.5938.22/chrome/browser/webauthn/authenticator_request_dialog_model.h =================================================================== ---- chromium-116.0.5845.42.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h -+++ chromium-116.0.5845.42/chrome/browser/webauthn/authenticator_request_dialog_model.h +--- chromium-117.0.5938.22.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h ++++ chromium-117.0.5938.22/chrome/browser/webauthn/authenticator_request_dialog_model.h @@ -8,6 +8,7 @@ #include <memory> #include <string> @@ -361,10 +349,10 @@ #include "base/containers/span.h" #include "base/functional/callback_forward.h" -Index: chromium-116.0.5845.42/gin/time_clamper.h +Index: chromium-117.0.5938.22/gin/time_clamper.h =================================================================== ---- chromium-116.0.5845.42.orig/gin/time_clamper.h -+++ chromium-116.0.5845.42/gin/time_clamper.h +--- chromium-117.0.5938.22.orig/gin/time_clamper.h ++++ chromium-117.0.5938.22/gin/time_clamper.h @@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper { const int64_t micros = now_micros % 1000; // abs() is necessary for devices with times before unix-epoch (most likely @@ -374,10 +362,10 @@ return now_micros / 1000; } return ClampTimeResolution(now_micros) / 1000; -Index: chromium-116.0.5845.42/chrome/test/chromedriver/chrome/web_view_impl.cc +Index: chromium-117.0.5938.22/chrome/test/chromedriver/chrome/web_view_impl.cc =================================================================== ---- chromium-116.0.5845.42.orig/chrome/test/chromedriver/chrome/web_view_impl.cc -+++ chromium-116.0.5845.42/chrome/test/chromedriver/chrome/web_view_impl.cc +--- chromium-117.0.5938.22.orig/chrome/test/chromedriver/chrome/web_view_impl.cc ++++ chromium-117.0.5938.22/chrome/test/chromedriver/chrome/web_view_impl.cc @@ -11,6 +11,7 @@ #include <queue> #include <utility>