Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2024-01-14 19:01:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Sun Jan 14 19:01:48 2024 rev:409 rq:1138475 version:120.0.6099.216
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2023-11-29
21:20:45.673234035 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new.21961/chromium.changes
2024-01-14 19:03:01.302386584 +0100
@@ -1,0 +2,38 @@
+Sat Jan 13 08:29:26 UTC 2024 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- Chromium 120.0.6099.216 (boo#1217839, boo#1218048, boo#1218302,
+ boo#1218533, boo#1218719)
+ * CVE-2024-0333: Insufficient data validation in Extensions
+ * CVE-2024-0222: Use after free in ANGLE
+ * CVE-2024-0223: Heap buffer overflow in ANGLE
+ * CVE-2024-0224: Use after free in WebAudio
+ * CVE-2024-0225: Use after free in WebGPU
+ * CVE-2023-7024: Heap buffer overflow in WebRTC
+ * CVE-2023-6702: Type Confusion in V8
+ * CVE-2023-6703: Use after free in Blink
+ * CVE-2023-6704: Use after free in libavif (boo#1218303)
+ * CVE-2023-6705: Use after free in WebRTC
+ * CVE-2023-6706: Use after free in FedCM
+ * CVE-2023-6707: Use after free in CSS
+ * CVE-2023-6508: Use after free in Media Stream
+ * CVE-2023-6509: Use after free in Side Panel Search
+ * CVE-2023-6510: Use after free in Media Capture
+ * CVE-2023-6511: Inappropriate implementation in Autofill
+ * CVE-2023-6512: Inappropriate implementation in Web Browser UI
+- drop patches:
+ * chromium-system-libusb.patch
+ * chromium-119-nullptr_t-without-namespace-std.patch
+ * chromium-119-no_matching_constructor.patch
+ * chromium-117-workaround_clang_bug-structured_binding.patch
+- add patches:
+ * chromium-120-nullptr_t-without-namespace-std.patch
+ * chromium-120-emplace.patch
+ * chromium-120-lp155-typename.patch
+ * chromium-120-no_matching_constructor.patch
+ * chromium-120-missing-header-files.patch
+ * chromium-120-emplace-struct.patch
+ * chromium-120-workaround_clang_bug-structured_binding.patch
+- add patches for Leap that revert braking changes:
+ * chromium-120-lp155-revert-clang-build-failure.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-117-workaround_clang_bug-structured_binding.patch
chromium-119-no_matching_constructor.patch
chromium-119-nullptr_t-without-namespace-std.patch
chromium-119.0.6045.199.tar.xz
chromium-system-libusb.patch
New:
----
chromium-120-emplace-struct.patch
chromium-120-emplace.patch
chromium-120-lp155-revert-clang-build-failure.patch
chromium-120-lp155-typename.patch
chromium-120-missing-header-files.patch
chromium-120-no_matching_constructor.patch
chromium-120-nullptr_t-without-namespace-std.patch
chromium-120-workaround_clang_bug-structured_binding.patch
chromium-120.0.6099.216.tar.xz
BETA DEBUG BEGIN:
Old: * chromium-119-no_matching_constructor.patch
* chromium-117-workaround_clang_bug-structured_binding.patch
- add patches:
Old: * chromium-119-nullptr_t-without-namespace-std.patch
* chromium-119-no_matching_constructor.patch
* chromium-117-workaround_clang_bug-structured_binding.patch
Old: * chromium-system-libusb.patch
* chromium-119-nullptr_t-without-namespace-std.patch
* chromium-119-no_matching_constructor.patch
Old:- drop patches:
* chromium-system-libusb.patch
* chromium-119-nullptr_t-without-namespace-std.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New: * chromium-120-missing-header-files.patch
* chromium-120-emplace-struct.patch
* chromium-120-workaround_clang_bug-structured_binding.patch
New: * chromium-120-nullptr_t-without-namespace-std.patch
* chromium-120-emplace.patch
* chromium-120-lp155-typename.patch
New:- add patches for Leap that revert braking changes:
* chromium-120-lp155-revert-clang-build-failure.patch
New: * chromium-120-emplace.patch
* chromium-120-lp155-typename.patch
* chromium-120-no_matching_constructor.patch
New: * chromium-120-no_matching_constructor.patch
* chromium-120-missing-header-files.patch
* chromium-120-emplace-struct.patch
New: * chromium-120-lp155-typename.patch
* chromium-120-no_matching_constructor.patch
* chromium-120-missing-header-files.patch
New:- add patches:
* chromium-120-nullptr_t-without-namespace-std.patch
* chromium-120-emplace.patch
New: * chromium-120-emplace-struct.patch
* chromium-120-workaround_clang_bug-structured_binding.patch
- add patches for Leap that revert braking changes:
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:13.518831606 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:13.522831752 +0100
@@ -1,9 +1,9 @@
#
-# spec file for package chromium
+# spec file
#
-# Copyright (c) 2023 SUSE LLC
-# Copyright (c) 2023 Callum Farmer <gm...@opensuse.org>
-# Copyright (c) 2023 Andreas Stieger <andreas.stie...@gmx.de>
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Callum Farmer <gm...@opensuse.org>
+# Copyright (c) 2024 Andreas Stieger <andreas.stie...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
# LLVM version
%define llvm_version 15
# GCC version
-%define gcc_version 12
+%define gcc_version 13
%if 0%{?suse_version} < 1699
%bcond_with system_re2
%bcond_with system_webp
@@ -87,7 +87,7 @@
%define n_suffix %{nil}
%endif
Name: chromium%{n_suffix}
-Version: 119.0.6045.199
+Version: 120.0.6099.216
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause AND LGPL-2.1-or-later
@@ -111,7 +111,6 @@
# PATCH-FIX-OPENSUSE fix_building_widevinecdm_with_chromium.patch - Enable
WideVine plugin
Patch3: fix_building_widevinecdm_with_chromium.patch
Patch4: chromium-buildname.patch
-Patch5: chromium-system-libusb.patch
Patch6: gcc-enable-lto.patch
# Do not use unrar code, it is non-free
Patch7: chromium-norar.patch
@@ -132,7 +131,6 @@
Patch211: gcc13-fix.patch
Patch214: chromium-113-webview-namespace.patch
Patch215: chromium-113-webauth-include-variant.patch
-Patch217: chromium-117-workaround_clang_bug-structured_binding.patch
Patch218: chromium-114-lld-argument.patch
Patch221: chromium-115-lp155-typename.patch
Patch224: chromium-115-compiler-SkColor4f.patch
@@ -144,12 +142,15 @@
Patch241: chromium-117-lp155-typename.patch
Patch242: chromium-118-includes.patch
Patch244: chromium-117-system-zstd.patch
-Patch245: chromium-119-no_matching_constructor.patch
Patch246: chromium-119-dont-redefine-ATSPI-version-macros.patch
-Patch247: chromium-119-nullptr_t-without-namespace-std.patch
Patch248: chromium-119-assert.patch
-BuildRequires: (python3 >= 3.7 or python3-dataclasses)
-BuildRequires: (python3-importlib-metadata if python3-base < 3.8)
+Patch249: chromium-120-nullptr_t-without-namespace-std.patch
+Patch250: chromium-120-emplace.patch
+Patch251: chromium-120-lp155-typename.patch
+Patch252: chromium-120-no_matching_constructor.patch
+Patch253: chromium-120-missing-header-files.patch
+Patch254: chromium-120-emplace-struct.patch
+Patch255: chromium-120-workaround_clang_bug-structured_binding.patch
BuildRequires: SDL-devel
BuildRequires: bison
BuildRequires: cups-devel
@@ -159,9 +160,11 @@
BuildRequires: flex
BuildRequires: git
BuildRequires: gn >= 0.1807
-BuildRequires: golang(API)
BuildRequires: gperf
BuildRequires: hicolor-icon-theme
+BuildRequires: (python3 >= 3.7 or python3-dataclasses)
+BuildRequires: (python3-importlib-metadata if python3-base < 3.8)
+BuildRequires: golang(API)
# Java used during build
BuildRequires: java-openjdk-headless
BuildRequires: libdc1394
@@ -286,6 +289,9 @@
%if 0%{?sle_version} == 150400
Patch300: chromium-114-revert-av1enc-lp154.patch
%endif
+%if 0%{?sle_version} <= 150600
+Patch301: chromium-120-lp155-revert-clang-build-failure.patch
+%endif
%if 0%{?suse_version} <= 1500
BuildRequires: pkgconfig(glproto)
%endif
++++++ chromium-110-compiler.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:13.586834083 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:13.590834229 +0100
@@ -7,11 +7,11 @@
build/config/compiler/BUILD.gn | 134 +++++----------------------------
1 file changed, 17 insertions(+), 117 deletions(-)
-Index: chromium-119.0.6045.123/build/config/compiler/BUILD.gn
+Index: chromium-120.0.6099.35/build/config/compiler/BUILD.gn
===================================================================
---- chromium-119.0.6045.123.orig/build/config/compiler/BUILD.gn
-+++ chromium-119.0.6045.123/build/config/compiler/BUILD.gn
-@@ -314,9 +314,7 @@ config("compiler") {
+--- chromium-120.0.6099.35.orig/build/config/compiler/BUILD.gn
++++ chromium-120.0.6099.35/build/config/compiler/BUILD.gn
+@@ -320,9 +320,7 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -21,7 +21,7 @@
":compiler_codegen",
":compiler_deterministic",
]
-@@ -580,37 +578,6 @@ config("compiler") {
+@@ -591,55 +589,6 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -48,6 +48,24 @@
- }
- }
-
+- # TODO(crbug.com/1488374): This causes binary size growth and potentially
+- # other problems.
+- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm
version.
+- if (default_toolchain != "//build/toolchain/cros:target" &&
+- !llvm_android_mainline) {
+- cflags += [
+- "-mllvm",
+- "-split-threshold-for-reg-with-hint=0",
+- ]
+- if (use_thin_lto && is_a_target_toolchain) {
+- if (is_win) {
+- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
+- } else {
+- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
+- }
+- }
+- }
+-
- # TODO(crbug.com/1235145): Investigate why/if this should be needed.
- if (is_win) {
- cflags += [ "/clang:-ffp-contract=off" ]
@@ -59,7 +77,7 @@
# C11/C++11 compiler flags setup.
# ---------------------------
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1474,46 +1441,6 @@ config("compiler_deterministic") {
+@@ -1514,46 +1463,6 @@ config("compiler_deterministic") {
}
}
@@ -106,7 +124,7 @@
# Tells the compiler not to use absolute paths when passing the default
# paths to the tools it invokes. We don't want this because we don't
# really need it and it can mess up the goma cache entries.
-@@ -1532,27 +1459,6 @@ config("compiler_deterministic") {
+@@ -1572,27 +1481,6 @@ config("compiler_deterministic") {
}
}
@@ -134,7 +152,7 @@
config("rustc_revision") {
if (rustc_revision != "") {
# Similar to the above config, this is here so that all files get
recompiled
-@@ -1915,10 +1821,6 @@ config("chromium_code") {
+@@ -1959,10 +1847,6 @@ config("chromium_code") {
}
} else {
cflags = [ "-Wall" ]
@@ -145,7 +163,7 @@
# In Chromium code, we define __STDC_foo_MACROS in order to get the
# C99 macros on Mac and Linux.
-@@ -1927,23 +1829,6 @@ config("chromium_code") {
+@@ -1971,24 +1855,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS",
]
@@ -158,9 +176,10 @@
- # disabled, so only do that for Release build.
- fortify_level = "2"
-
-- # ChromeOS supports a high-quality _FORTIFY_SOURCE=3 implementation
-- # with a few custom glibc patches. Use that if it's available.
-- if (is_chromeos_ash) {
+- # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
+- # implementation with a few custom glibc patches. Use that if it's
+- # available.
+- if (is_chromeos_device && !lacros_use_chromium_toolchain) {
- fortify_level = "3"
- }
- defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
@@ -169,7 +188,7 @@
if (is_apple) {
cflags_objc = [ "-Wimplicit-retain-self" ]
cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2326,7 +2211,8 @@ config("default_stack_frames") {
+@@ -2371,7 +2237,8 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -179,7 +198,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2385,7 +2271,8 @@ config("optimize") {
+@@ -2430,7 +2297,8 @@ config("optimize") {
}
# Turn off optimizations.
@@ -189,7 +208,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2425,7 +2312,8 @@ config("no_optimize") {
+@@ -2470,7 +2338,8 @@ config("no_optimize") {
# Turns up the optimization level. On Windows, this implies whole program
# optimization and link-time code generation which is very expensive and
should
# be used sparingly.
@@ -199,7 +218,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2458,7 +2346,8 @@ config("optimize_max") {
+@@ -2503,7 +2372,8 @@ config("optimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -209,7 +228,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2484,7 +2373,8 @@ config("optimize_speed") {
+@@ -2529,7 +2399,8 @@ config("optimize_speed") {
}
}
@@ -219,7 +238,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
-@@ -2617,7 +2507,8 @@ config("win_pdbaltpath") {
+@@ -2662,7 +2533,8 @@ config("win_pdbaltpath") {
}
# Full symbols.
@@ -229,7 +248,7 @@
rustflags = []
if (is_win) {
if (is_clang) {
-@@ -2766,7 +2657,8 @@ config("symbols") {
+@@ -2811,7 +2683,8 @@ config("symbols") {
# Minimal symbols.
# This config guarantees to hold symbol for stack trace which are shown to
user
# when crash happens in unittests running on buildbot.
@@ -239,7 +258,7 @@
rustflags = []
if (is_win) {
# Functions, files, and line tables only.
-@@ -2851,7 +2743,8 @@ config("minimal_symbols") {
+@@ -2896,7 +2769,8 @@ config("minimal_symbols") {
# This configuration contains function names only. That is, the compiler is
# told to not generate debug information and the linker then just puts
function
# names in the final debug information.
++++++ chromium-114-lld-argument.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:13.606834811 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:13.610834958 +0100
@@ -1,11 +1,11 @@
-diff --git a/BUILD.gn b/BUILD.gn.new
-index 28c2255..7f89fe6 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -727,13 +727,6 @@ config("compiler") {
-
- ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
-
+Index: chromium-120.0.6099.35/build/config/compiler/BUILD.gn
+===================================================================
+--- chromium-120.0.6099.35.orig/build/config/compiler/BUILD.gn
++++ chromium-120.0.6099.35/build/config/compiler/BUILD.gn
+@@ -747,13 +747,6 @@ config("compiler") {
+ if (is_apple) {
+ ldflags += [ "-Wcrl,object_path_lto" ]
+ }
- if (!is_chromeos) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
++++++ chromium-117-system-zstd.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:13.642836123 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:13.646836269 +0100
@@ -3,18 +3,22 @@
Date: Sun, 17 Sep 2023 16:51:42 +1000
Subject: [PATCH] Add system-zstd
---- a/build/linux/unbundle/replace_gn_files.py
-+++ b/build/linux/unbundle/replace_gn_files.py
-@@ -74,6 +74,7 @@ REPLACEMENTS = {
- #
+Index: chromium-120.0.6099.18/build/linux/unbundle/replace_gn_files.py
+===================================================================
+--- chromium-120.0.6099.18.orig/build/linux/unbundle/replace_gn_files.py
++++ chromium-120.0.6099.18/build/linux/unbundle/replace_gn_files.py
+@@ -79,6 +79,7 @@ REPLACEMENTS = {
+ 'vulkan_memory_allocator' : 'third_party/vulkan_memory_allocator/BUILD.gn',
'woff2': 'third_party/woff2/BUILD.gn',
'zlib': 'third_party/zlib/BUILD.gn',
+ 'zstd': 'third_party/zstd/BUILD.gn',
}
+Index: chromium-120.0.6099.18/build/linux/unbundle/zstd.gn
+===================================================================
--- /dev/null
-+++ b/build/linux/unbundle/zstd.gn
++++ chromium-120.0.6099.18/build/linux/unbundle/zstd.gn
@@ -0,0 +1,25 @@
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
@@ -41,7 +45,4 @@
+ deps = [ ":zstd_shim" ]
+ public_configs = [ ":system_zstd" ]
+}
---
-2.42.0
-
++++++ chromium-118-includes.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:13.658836706 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:13.662836851 +0100
@@ -1,7 +1,7 @@
-Index:
chromium-119.0.6045.21/services/device/public/cpp/generic_sensor/sensor_reading.h
+Index:
chromium-120.0.6099.18/services/device/public/cpp/generic_sensor/sensor_reading.h
===================================================================
----
chromium-119.0.6045.21.orig/services/device/public/cpp/generic_sensor/sensor_reading.h
-+++
chromium-119.0.6045.21/services/device/public/cpp/generic_sensor/sensor_reading.h
+---
chromium-120.0.6099.18.orig/services/device/public/cpp/generic_sensor/sensor_reading.h
++++
chromium-120.0.6099.18/services/device/public/cpp/generic_sensor/sensor_reading.h
@@ -9,6 +9,8 @@
#include <stdint.h>
@@ -11,13 +11,13 @@
namespace device {
-Index: chromium-119.0.6045.21/components/gwp_asan/client/lightweight_detector.h
+Index: chromium-120.0.6099.18/components/gwp_asan/client/lightweight_detector.h
===================================================================
----
chromium-119.0.6045.21.orig/components/gwp_asan/client/lightweight_detector.h
-+++ chromium-119.0.6045.21/components/gwp_asan/client/lightweight_detector.h
-@@ -7,6 +7,8 @@
-
+---
chromium-120.0.6099.18.orig/components/gwp_asan/client/lightweight_detector.h
++++ chromium-120.0.6099.18/components/gwp_asan/client/lightweight_detector.h
+@@ -8,6 +8,8 @@
#include <atomic>
+ #include <memory>
+#include <atomic>
+
++++++ chromium-120-emplace-struct.patch ++++++
diff --git a/shared_image_backing.h b/shared_image_backing.h.new
index 97ebd0b..fc6179c 100644
--- a/gpu/command_buffer/service/shared_image/shared_image_backing.h
+++ b/gpu/command_buffer/service/shared_image/shared_image_backing.h
@@ -338,7 +338,7 @@ class GPU_GLES2_EXPORT SharedImageBacking {
private:
class ScopedWriteUMA {
public:
- ScopedWriteUMA() = default;
+ ScopedWriteUMA() : content_consumed_(false) {}
ScopedWriteUMA(const ScopedWriteUMA&) = delete;
ScopedWriteUMA& operator=(const ScopedWriteUMA&) = delete;
@@ -352,7 +352,7 @@ class GPU_GLES2_EXPORT SharedImageBacking {
void SetConsumed() { content_consumed_ = true; }
private:
- bool content_consumed_ = false;
+ bool content_consumed_;
};
const Mailbox mailbox_;
diff --git a/history_item.h b/history_item.h.new
index 15fea48..ba59305 100644
--- a/third_party/blink/renderer/core/loader/history_item.h
+++ b/third_party/blink/renderer/core/loader/history_item.h
@@ -77,13 +77,13 @@ class CORE_EXPORT HistoryItem final : public
GarbageCollected<HistoryItem> {
DISALLOW_NEW();
public:
- ViewState() = default;
+ ViewState() : page_scale_factor_(0) {}
ViewState(const ViewState&) = default;
ViewState& operator=(const ViewState&) = default;
ScrollOffset visual_viewport_scroll_offset_;
ScrollOffset scroll_offset_;
- float page_scale_factor_ = 0;
+ float page_scale_factor_;
ScrollAnchorData scroll_anchor_data_;
};
++++++ chromium-120-emplace.patch ++++++
Index:
chromium-120.0.6099.129/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
===================================================================
---
chromium-120.0.6099.129.orig/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
+++
chromium-120.0.6099.129/third_party/webrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
@@ -508,7 +508,7 @@ absl::optional<LossBasedBweV2::Config> L
if (!enabled.Get()) {
return config;
}
- config.emplace();
+ config.emplace(Config());
config->bandwidth_rampup_upper_bound_factor =
bandwidth_rampup_upper_bound_factor.Get();
config->rampup_acceleration_max_factor =
rampup_acceleration_max_factor.Get();
Index: chromium-120.0.6099.129/ui/gfx/x/generated_protos/randr.cc
===================================================================
--- chromium-120.0.6099.129.orig/ui/gfx/x/generated_protos/randr.cc
+++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/randr.cc
@@ -304,7 +304,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
// data
auto data_expr = subCode;
if (CaseEq(data_expr, RandR::Notify::CrtcChange)) {
- data.cc.emplace();
+ data.cc.emplace(RandR::NotifyEvent::Cc());
auto& timestamp = (*data.cc).timestamp;
auto& window = (*data.cc).window;
auto& crtc = (*data.cc).crtc;
@@ -348,7 +348,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
Read(&height, &buf);
}
if (CaseEq(data_expr, RandR::Notify::OutputChange)) {
- data.oc.emplace();
+ data.oc.emplace(RandR::NotifyEvent::Oc());
auto& timestamp = (*data.oc).timestamp;
auto& config_timestamp = (*data.oc).config_timestamp;
auto& window = (*data.oc).window;
@@ -393,7 +393,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
subpixel_order = static_cast<Render::SubPixel>(tmp6);
}
if (CaseEq(data_expr, RandR::Notify::OutputProperty)) {
- data.op.emplace();
+ data.op.emplace(RandR::NotifyEvent::Op());
auto& window = (*data.op).window;
auto& output = (*data.op).output;
auto& atom = (*data.op).atom;
@@ -421,7 +421,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
Pad(&buf, 11);
}
if (CaseEq(data_expr, RandR::Notify::ProviderChange)) {
- data.pc.emplace();
+ data.pc.emplace(RandR::NotifyEvent::Pc());
auto& timestamp = (*data.pc).timestamp;
auto& window = (*data.pc).window;
auto& provider = (*data.pc).provider;
@@ -439,7 +439,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
Pad(&buf, 16);
}
if (CaseEq(data_expr, RandR::Notify::ProviderProperty)) {
- data.pp.emplace();
+ data.pp.emplace(RandR::NotifyEvent::Pp());
auto& window = (*data.pp).window;
auto& provider = (*data.pp).provider;
auto& atom = (*data.pp).atom;
@@ -465,7 +465,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
Pad(&buf, 11);
}
if (CaseEq(data_expr, RandR::Notify::ResourceChange)) {
- data.rc.emplace();
+ data.rc.emplace(RandR::NotifyEvent::Rc());
auto& timestamp = (*data.rc).timestamp;
auto& window = (*data.rc).window;
@@ -479,7 +479,7 @@ void ReadEvent<RandR::NotifyEvent>(RandR::NotifyEvent*
event_,
Pad(&buf, 20);
}
if (CaseEq(data_expr, RandR::Notify::Lease)) {
- data.lc.emplace();
+ data.lc.emplace(RandR::NotifyEvent::Lc());
auto& timestamp = (*data.lc).timestamp;
auto& window = (*data.lc).window;
auto& lease = (*data.lc).lease;
Index: chromium-120.0.6099.129/ui/gfx/x/generated_protos/xkb.cc
===================================================================
--- chromium-120.0.6099.129.orig/ui/gfx/x/generated_protos/xkb.cc
+++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/xkb.cc
@@ -5284,7 +5284,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply> detail::ReadReply<
if (CaseAnd(replies_expr, Xkb::GBNDetail::Types) ||
CaseAnd(replies_expr, Xkb::GBNDetail::ClientSymbols) ||
CaseAnd(replies_expr, Xkb::GBNDetail::ServerSymbols)) {
- replies.types.emplace();
+ replies.types.emplace(Xkb::GetKbdByNameReply::Types());
auto& getmap_type = (*replies.types).getmap_type;
auto& typeDeviceID = (*replies.types).typeDeviceID;
auto& getmap_sequence = (*replies.types).getmap_sequence;
@@ -5716,7 +5716,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply> detail::ReadReply<
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::CompatMap)) {
- replies.compat_map.emplace();
+ replies.compat_map.emplace(Xkb::GetKbdByNameReply::CompatMap());
auto& compatmap_type = (*replies.compat_map).compatmap_type;
auto& compatDeviceID = (*replies.compat_map).compatDeviceID;
auto& compatmap_sequence = (*replies.compat_map).compatmap_sequence;
@@ -5840,7 +5840,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply> detail::ReadReply<
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::IndicatorMaps)) {
- replies.indicator_maps.emplace();
+ replies.indicator_maps.emplace(Xkb::GetKbdByNameReply::IndicatorMaps());
auto& indicatormap_type = (*replies.indicator_maps).indicatormap_type;
auto& indicatorDeviceID = (*replies.indicator_maps).indicatorDeviceID;
auto& indicatormap_sequence =
@@ -5934,7 +5934,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply> detail::ReadReply<
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::KeyNames) ||
CaseAnd(replies_expr, Xkb::GBNDetail::OtherNames)) {
- replies.key_names.emplace();
+ replies.key_names.emplace(Xkb::GetKbdByNameReply::KeyNames());
auto& keyname_type = (*replies.key_names).keyname_type;
auto& keyDeviceID = (*replies.key_names).keyDeviceID;
auto& keyname_sequence = (*replies.key_names).keyname_sequence;
@@ -6193,7 +6193,7 @@ std::unique_ptr<Xkb::GetKbdByNameReply> detail::ReadReply<
}
}
if (CaseAnd(replies_expr, Xkb::GBNDetail::Geometry)) {
- replies.geometry.emplace();
+ replies.geometry.emplace(Xkb::GetKbdByNameReply::Geometry());
auto& geometry_type = (*replies.geometry).geometry_type;
auto& geometryDeviceID = (*replies.geometry).geometryDeviceID;
auto& geometry_sequence = (*replies.geometry).geometry_sequence;
Index: chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc
===================================================================
---
chromium-120.0.6099.129.orig/mojo/public/cpp/bindings/lib/multiplex_router.cc
+++ chromium-120.0.6099.129/mojo/public/cpp/bindings/lib/multiplex_router.cc
@@ -870,7 +870,7 @@ bool MultiplexRouter::ExclusiveSyncWaitForReply(InterfaceId
interface_id,
DCHECK(!exclusive_sync_wait_);
scoped_refptr<MultiplexRouter> keep_alive(this);
- exclusive_sync_wait_.emplace();
+ exclusive_sync_wait_.emplace(MultiplexRouter::ExclusiveSyncWaitInfo());
exclusive_sync_wait_->interface_id = interface_id;
exclusive_sync_wait_->request_id = request_id;
while (!exclusive_sync_wait_->finished) {
Index: chromium-120.0.6099.129/ui/gfx/x/generated_protos/xinput.cc
===================================================================
--- chromium-120.0.6099.129.orig/ui/gfx/x/generated_protos/xinput.cc
+++ chromium-120.0.6099.129/ui/gfx/x/generated_protos/xinput.cc
@@ -566,7 +566,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
// data
auto data_expr = type;
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
- data.key.emplace();
+ data.key.emplace(Input::DeviceClass::Key());
uint16_t num_keys{};
auto& keys = (*data.key).keys;
size_t keys_len = keys.size();
@@ -582,7 +582,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
- data.button.emplace();
+ data.button.emplace(Input::DeviceClass::Button());
uint16_t num_buttons{};
auto& state = (*data.button).state;
size_t state_len = state.size();
@@ -607,7 +607,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
- data.valuator.emplace();
+ data.valuator.emplace(Input::DeviceClass::Valuator());
auto& number = (*data.valuator).number;
auto& label = (*data.valuator).label;
auto& min = (*data.valuator).min;
@@ -670,7 +670,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
- data.scroll.emplace();
+ data.scroll.emplace(Input::DeviceClass::Scroll());
auto& number = (*data.scroll).number;
auto& scroll_type = (*data.scroll).scroll_type;
auto& flags = (*data.scroll).flags;
@@ -705,7 +705,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
- data.touch.emplace();
+ data.touch.emplace(Input::DeviceClass::Touch());
auto& mode = (*data.touch).mode;
auto& num_touches = (*data.touch).num_touches;
@@ -718,7 +718,7 @@ void
ReadEvent<Input::DeviceChangedEvent>(Input::DeviceChangedEvent* event_,
Read(&num_touches, &buf);
}
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
- data.gesture.emplace();
+ data.gesture.emplace(Input::DeviceClass::Gesture());
auto& num_touches = (*data.gesture).num_touches;
// num_touches
@@ -2205,7 +2205,7 @@ std::unique_ptr<Input::ListInputDevicesReply>
detail::ReadReply<
// info
auto info_expr = class_id;
if (CaseEq(info_expr, Input::InputClass::Key)) {
- info.key.emplace();
+ info.key.emplace(Input::InputInfo::Key());
auto& min_keycode = (*info.key).min_keycode;
auto& max_keycode = (*info.key).max_keycode;
auto& num_keys = (*info.key).num_keys;
@@ -2223,14 +2223,14 @@ std::unique_ptr<Input::ListInputDevicesReply>
detail::ReadReply<
Pad(&buf, 2);
}
if (CaseEq(info_expr, Input::InputClass::Button)) {
- info.button.emplace();
+ info.button.emplace(Input::InputInfo::Button());
auto& num_buttons = (*info.button).num_buttons;
// num_buttons
Read(&num_buttons, &buf);
}
if (CaseEq(info_expr, Input::InputClass::Valuator)) {
- info.valuator.emplace();
+ info.valuator.emplace(Input::InputInfo::Valuator());
uint8_t axes_len{};
auto& mode = (*info.valuator).mode;
auto& motion_size = (*info.valuator).motion_size;
@@ -3843,7 +3843,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
// data
auto data_expr = class_id;
if (CaseEq(data_expr, Input::FeedbackClass::Keyboard)) {
- data.keyboard.emplace();
+ data.keyboard.emplace(Input::FeedbackState::Keyboard());
auto& pitch = (*data.keyboard).pitch;
auto& duration = (*data.keyboard).duration;
auto& led_mask = (*data.keyboard).led_mask;
@@ -3885,7 +3885,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::FeedbackClass::Pointer)) {
- data.pointer.emplace();
+ data.pointer.emplace(Input::FeedbackState::Pointer());
auto& accel_num = (*data.pointer).accel_num;
auto& accel_denom = (*data.pointer).accel_denom;
auto& threshold = (*data.pointer).threshold;
@@ -3903,7 +3903,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
Read(&threshold, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::String)) {
- data.string.emplace();
+ data.string.emplace(Input::FeedbackState::String());
auto& max_symbols = (*data.string).max_symbols;
uint16_t num_keysyms{};
auto& keysyms = (*data.string).keysyms;
@@ -3923,7 +3923,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::FeedbackClass::Integer)) {
- data.integer.emplace();
+ data.integer.emplace(Input::FeedbackState::Integer());
auto& resolution = (*data.integer).resolution;
auto& min_value = (*data.integer).min_value;
auto& max_value = (*data.integer).max_value;
@@ -3938,7 +3938,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
Read(&max_value, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::Led)) {
- data.led.emplace();
+ data.led.emplace(Input::FeedbackState::Led());
auto& led_mask = (*data.led).led_mask;
auto& led_values = (*data.led).led_values;
@@ -3949,7 +3949,7 @@ std::unique_ptr<Input::GetFeedbackControlReply>
detail::ReadReply<
Read(&led_values, &buf);
}
if (CaseEq(data_expr, Input::FeedbackClass::Bell)) {
- data.bell.emplace();
+ data.bell.emplace(Input::FeedbackState::Bell());
auto& percent = (*data.bell).percent;
auto& pitch = (*data.bell).pitch;
auto& duration = (*data.bell).duration;
@@ -4769,7 +4769,7 @@ std::unique_ptr<Input::QueryDeviceStateReply>
detail::ReadReply<
// data
auto data_expr = class_id;
if (CaseEq(data_expr, Input::InputClass::Key)) {
- data.key.emplace();
+ data.key.emplace(Input::InputState::Key());
auto& num_keys = (*data.key).num_keys;
auto& keys = (*data.key).keys;
size_t keys_len = keys.size();
@@ -4787,7 +4787,7 @@ std::unique_ptr<Input::QueryDeviceStateReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::InputClass::Button)) {
- data.button.emplace();
+ data.button.emplace(Input::InputState::Button());
auto& num_buttons = (*data.button).num_buttons;
auto& buttons = (*data.button).buttons;
size_t buttons_len = buttons.size();
@@ -4805,7 +4805,7 @@ std::unique_ptr<Input::QueryDeviceStateReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::InputClass::Valuator)) {
- data.valuator.emplace();
+ data.valuator.emplace(Input::InputState::Valuator());
uint8_t num_valuators{};
auto& mode = (*data.valuator).mode;
auto& valuators = (*data.valuator).valuators;
@@ -5076,7 +5076,7 @@ std::unique_ptr<Input::GetDeviceControlReply>
detail::ReadReply<
// data
auto data_expr = control_id;
if (CaseEq(data_expr, Input::DeviceControl::resolution)) {
- data.resolution.emplace();
+ data.resolution.emplace(Input::DeviceState::Resolution());
uint32_t num_valuators{};
auto& resolution_values = (*data.resolution).resolution_values;
size_t resolution_values_len = resolution_values.size();
@@ -5110,7 +5110,7 @@ std::unique_ptr<Input::GetDeviceControlReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::DeviceControl::abs_calib)) {
- data.abs_calib.emplace();
+ data.abs_calib.emplace(Input::DeviceState::AbsCalib());
auto& min_x = (*data.abs_calib).min_x;
auto& max_x = (*data.abs_calib).max_x;
auto& min_y = (*data.abs_calib).min_y;
@@ -5145,7 +5145,7 @@ std::unique_ptr<Input::GetDeviceControlReply>
detail::ReadReply<
Read(&button_threshold, &buf);
}
if (CaseEq(data_expr, Input::DeviceControl::core)) {
- data.core.emplace();
+ data.core.emplace(Input::DeviceState::Core());
auto& status = (*data.core).status;
auto& iscore = (*data.core).iscore;
@@ -5159,7 +5159,7 @@ std::unique_ptr<Input::GetDeviceControlReply>
detail::ReadReply<
Pad(&buf, 2);
}
if (CaseEq(data_expr, Input::DeviceControl::enable)) {
- data.enable.emplace();
+ data.enable.emplace(Input::DeviceState::Enable());
auto& enable = (*data.enable).enable;
// enable
@@ -5169,7 +5169,7 @@ std::unique_ptr<Input::GetDeviceControlReply>
detail::ReadReply<
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceControl::abs_area)) {
- data.abs_area.emplace();
+ data.abs_area.emplace(Input::DeviceState::AbsArea());
auto& offset_x = (*data.abs_area).offset_x;
auto& offset_y = (*data.abs_area).offset_y;
auto& width = (*data.abs_area).width;
@@ -6661,7 +6661,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
// data
auto data_expr = type;
if (CaseEq(data_expr, Input::DeviceClassType::Key)) {
- data.key.emplace();
+ data.key.emplace(Input::DeviceClass::Key());
uint16_t num_keys{};
auto& keys = (*data.key).keys;
size_t keys_len = keys.size();
@@ -6677,7 +6677,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Button)) {
- data.button.emplace();
+ data.button.emplace(Input::DeviceClass::Button());
uint16_t num_buttons{};
auto& state = (*data.button).state;
size_t state_len = state.size();
@@ -6702,7 +6702,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Valuator)) {
- data.valuator.emplace();
+ data.valuator.emplace(Input::DeviceClass::Valuator());
auto& number = (*data.valuator).number;
auto& label = (*data.valuator).label;
auto& min = (*data.valuator).min;
@@ -6765,7 +6765,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
Pad(&buf, 3);
}
if (CaseEq(data_expr, Input::DeviceClassType::Scroll)) {
- data.scroll.emplace();
+ data.scroll.emplace(Input::DeviceClass::Scroll());
auto& number = (*data.scroll).number;
auto& scroll_type = (*data.scroll).scroll_type;
auto& flags = (*data.scroll).flags;
@@ -6800,7 +6800,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
}
}
if (CaseEq(data_expr, Input::DeviceClassType::Touch)) {
- data.touch.emplace();
+ data.touch.emplace(Input::DeviceClass::Touch());
auto& mode = (*data.touch).mode;
auto& num_touches = (*data.touch).num_touches;
@@ -6813,7 +6813,7 @@ std::unique_ptr<Input::XIQueryDeviceReply>
detail::ReadReply<
Read(&num_touches, &buf);
}
if (CaseEq(data_expr, Input::DeviceClassType::Gesture)) {
- data.gesture.emplace();
+ data.gesture.emplace(Input::DeviceClass::Gesture());
auto& num_touches = (*data.gesture).num_touches;
// num_touches
Index:
chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc
===================================================================
---
chromium-120.0.6099.129.orig/components/viz/service/display/surface_aggregator.cc
+++ chromium-120.0.6099.129/components/viz/service/display/surface_aggregator.cc
@@ -2228,7 +2228,7 @@ AggregatedFrame SurfaceAggregator::Aggregate(
root_surface_id_ = surface_id;
// Start recording new stats for this aggregation.
- stats_.emplace();
+ stats_.emplace(SurfaceAggregator::AggregateStatistics());
base::ElapsedTimer prewalk_timer;
ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);
Index:
chromium-120.0.6099.129/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc
===================================================================
---
chromium-120.0.6099.129.orig/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc
+++
chromium-120.0.6099.129/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.cc
@@ -37,7 +37,7 @@ void WebAppIconDiagnostic::Run(
if (!downloaded_icon_sizes.empty())
icon_size_ = *downloaded_icon_sizes.begin();
- result_.emplace();
+ result_.emplace(WebAppIconDiagnostic::Result());
result_->has_empty_downloaded_icon_sizes = downloaded_icon_sizes.empty();
result_->has_generated_icon_flag = app_->is_generated_icon();
Index:
chromium-120.0.6099.129/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
===================================================================
---
chromium-120.0.6099.129.orig/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
+++
chromium-120.0.6099.129/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
@@ -101,7 +101,7 @@ void MediaControlTimelineElement::UpdateAria() {
void MediaControlTimelineElement::SetPosition(double current_time,
bool suppress_aria) {
if (is_live_ && !live_anchor_time_ && current_time != 0) {
- live_anchor_time_.emplace();
+ live_anchor_time_.emplace(MediaControlTimelineElement::LiveAnchorTime());
live_anchor_time_->clock_time_ = base::TimeTicks::Now();
live_anchor_time_->media_time_ = MediaElement().currentTime();
}
Index:
chromium-120.0.6099.129/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
===================================================================
---
chromium-120.0.6099.129.orig/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
+++
chromium-120.0.6099.129/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
@@ -70,7 +70,7 @@ void GeometryMapperTransformCache::Update(
to_2d_translation_root_ += translation;
if (parent.plane_root_transform_) {
- plane_root_transform_.emplace();
+
plane_root_transform_.emplace(GeometryMapperTransformCache::PlaneRootTransform());
plane_root_transform_->plane_root = parent.plane_root();
plane_root_transform_->to_plane_root = parent.to_plane_root();
plane_root_transform_->to_plane_root.Translate(translation.x(),
@@ -98,7 +98,7 @@ void GeometryMapperTransformCache::Update(
// as the 2d translation root.
plane_root_transform_ = absl::nullopt;
} else {
- plane_root_transform_.emplace();
+
plane_root_transform_.emplace(GeometryMapperTransformCache::PlaneRootTransform());
plane_root_transform_->plane_root = parent.plane_root();
plane_root_transform_->to_plane_root.MakeIdentity();
parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
@@ -140,7 +140,7 @@ void GeometryMapperTransformCache::UpdateScreenTransform(
parent_node->UpdateScreenTransform();
const auto& parent = parent_node->GetTransformCache();
- screen_transform_.emplace();
+ screen_transform_.emplace(GeometryMapperTransformCache::ScreenTransform());
parent.ApplyToScreen(screen_transform_->to_screen);
if (node.FlattensInheritedTransform())
screen_transform_->to_screen.Flatten();
++++++ chromium-120-lp155-revert-clang-build-failure.patch ++++++
reverts 57526b8dc45b2e6c67bba7306f1dde73b1f2910c
"Remove unused items from the RaceNetworkRequest hashmap"
Bug: 1492640
Index:
chromium-120.0.6099.216/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
===================================================================
---
chromium-120.0.6099.216.orig/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
+++
chromium-120.0.6099.216/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc
@@ -46,7 +46,6 @@
#include "services/network/public/cpp/cross_origin_embedder_policy.h"
#include "services/network/public/mojom/cookie_manager.mojom-blink.h"
#include "services/network/public/mojom/cross_origin_embedder_policy.mojom.h"
-#include "services/network/public/mojom/url_loader_factory.mojom-blink.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include
"third_party/blink/public/mojom/notifications/notification.mojom-blink.h"
@@ -1097,10 +1096,6 @@ void ServiceWorkerGlobalScope::DidHandle
TRACE_ID_WITH_SCOPE(kServiceWorkerGlobalScopeTraceScope,
TRACE_ID_LOCAL(event_id)),
TRACE_EVENT_FLAG_FLOW_IN, "status", MojoEnumToString(status));
-
- // Delete the URLLoaderFactory for the RaceNetworkRequest if it's not used.
- RemoveItemFromRaceNetworkRequests(event_id);
-
if (!RunEventCallback(&fetch_event_callbacks_, event_queue_.get(), event_id,
status)) {
// The event may have been aborted. Its response callback also needs to be
@@ -1500,7 +1495,6 @@ void ServiceWorkerGlobalScope::AbortCall
response_callback_iter->value->TakeValue().reset();
fetch_response_callbacks_.erase(response_callback_iter);
}
- RemoveItemFromRaceNetworkRequests(event_id);
// Run the event callback with the error code.
auto event_callback_iter = fetch_event_callbacks_.find(event_id);
@@ -1557,11 +1551,52 @@ void ServiceWorkerGlobalScope::StartFetc
if (params->race_network_request_loader_factory &&
params->request->service_worker_race_network_request_token) {
- InsertNewItemToRaceNetworkRequests(
- event_id,
- params->request->service_worker_race_network_request_token.value(),
- std::move(params->race_network_request_loader_factory),
- params->request->url);
+ auto insert_result = race_network_request_loader_factories_.insert(
+ String(params->request->service_worker_race_network_request_token
+ ->ToString()),
+ std::move(params->race_network_request_loader_factory));
+
+ // DumpWithoutCrashing if the token is empty, or not inserted as a new
entry
+ // to |race_network_request_loader_factories_|.
+ // TODO(crbug.com/1492640) Remove DumpWithoutCrashing once we collect data
+ // and identify the cause.
+ static bool has_dumped_without_crashing_for_empty_token = false;
+ static bool has_dumped_without_crashing_for_not_new_entry = false;
+ if (!has_dumped_without_crashing_for_empty_token &&
+ params->request->service_worker_race_network_request_token
+ ->is_empty()) {
+ has_dumped_without_crashing_for_empty_token = true;
+ SCOPED_CRASH_KEY_BOOL(
+ "SWGlobalScope", "empty_race_token",
+ params->request->service_worker_race_network_request_token
+ ->is_empty());
+ SCOPED_CRASH_KEY_STRING64(
+ "SWGlobalScope", "race_token_string",
+ params->request->service_worker_race_network_request_token
+ ->ToString());
+ SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "race_insert_new_entry",
+ insert_result.is_new_entry);
+ SCOPED_CRASH_KEY_STRING256("SWGlobalScope", "race_request_url",
+ params->request->url.GetString().Utf8());
+ base::debug::DumpWithoutCrashing();
+ }
+ if (!has_dumped_without_crashing_for_not_new_entry &&
+ !insert_result.is_new_entry) {
+ has_dumped_without_crashing_for_not_new_entry = true;
+ SCOPED_CRASH_KEY_BOOL(
+ "SWGlobalScope", "empty_race_token",
+ params->request->service_worker_race_network_request_token
+ ->is_empty());
+ SCOPED_CRASH_KEY_STRING64(
+ "SWGlobalScope", "race_token_string",
+ params->request->service_worker_race_network_request_token
+ ->ToString());
+ SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "race_insert_new_entry",
+ insert_result.is_new_entry);
+ SCOPED_CRASH_KEY_STRING256("SWGlobalScope", "race_request_url",
+ params->request->url.GetString().Utf8());
+ base::debug::DumpWithoutCrashing();
+ }
}
Request* request = Request::Create(
@@ -2773,71 +2808,12 @@ bool ServiceWorkerGlobalScope::SetAttrib
absl::optional<mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>>
ServiceWorkerGlobalScope::FindRaceNetworkRequestURLLoaderFactory(
const base::UnguessableToken& token) {
- std::unique_ptr<RaceNetworkRequestInfo> result =
- race_network_requests_.Take(String(token.ToString()));
+ mojo::PendingRemote<network::mojom::blink::URLLoaderFactory> result =
+ race_network_request_loader_factories_.Take(String(token.ToString()));
if (result) {
- race_network_request_fetch_event_ids_.erase(result->fetch_event_id);
- return absl::optional<
- mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>>(
- std::move(result->url_loader_factory));
+ return result;
}
return absl::nullopt;
}
-void ServiceWorkerGlobalScope::InsertNewItemToRaceNetworkRequests(
- int fetch_event_id,
- const base::UnguessableToken& token,
- mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>
- url_loader_factory,
- const KURL& request_url) {
- auto race_network_request_token = String(token.ToString());
- auto info = std::make_unique<RaceNetworkRequestInfo>(
- fetch_event_id, race_network_request_token,
- std::move(url_loader_factory));
- race_network_request_fetch_event_ids_.insert(fetch_event_id, info.get());
- auto insert_result =
race_network_requests_.insert(race_network_request_token,
- std::move(info));
-
- // DumpWithoutCrashing if the token is empty, or not inserted as a new entry
- // to |race_network_request_loader_factories_|.
- // TODO(crbug.com/1492640) Remove DumpWithoutCrashing once we collect data
- // and identify the cause.
- static bool has_dumped_without_crashing_for_empty_token = false;
- static bool has_dumped_without_crashing_for_not_new_entry = false;
- if (!has_dumped_without_crashing_for_empty_token && token.is_empty()) {
- has_dumped_without_crashing_for_empty_token = true;
- SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "empty_race_token",
- token.is_empty());
- SCOPED_CRASH_KEY_STRING64("SWGlobalScope", "race_token_string",
- token.ToString());
- SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "race_insert_new_entry",
- insert_result.is_new_entry);
- SCOPED_CRASH_KEY_STRING256("SWGlobalScope", "race_request_url",
- request_url.GetString().Utf8());
- base::debug::DumpWithoutCrashing();
- }
- if (!has_dumped_without_crashing_for_not_new_entry &&
- !insert_result.is_new_entry) {
- has_dumped_without_crashing_for_not_new_entry = true;
- SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "empty_race_token",
- token.is_empty());
- SCOPED_CRASH_KEY_STRING64("SWGlobalScope", "race_token_string",
- token.ToString());
- SCOPED_CRASH_KEY_BOOL("SWGlobalScope", "race_insert_new_entry",
- insert_result.is_new_entry);
- SCOPED_CRASH_KEY_STRING256("SWGlobalScope", "race_request_url",
- request_url.GetString().Utf8());
- base::debug::DumpWithoutCrashing();
- }
-}
-
-void ServiceWorkerGlobalScope::RemoveItemFromRaceNetworkRequests(
- int fetch_event_id) {
- RaceNetworkRequestInfo* info =
- race_network_request_fetch_event_ids_.Take(fetch_event_id);
- if (info) {
- race_network_requests_.erase(info->token);
- }
-}
-
} // namespace blink
Index:
chromium-120.0.6099.216/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
===================================================================
---
chromium-120.0.6099.216.orig/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
+++
chromium-120.0.6099.216/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.h
@@ -623,14 +623,6 @@ class MODULES_EXPORT ServiceWorkerGlobal
// ServiceWorker.FetchEvent.QueuingTime histogram.
void RecordQueuingTime(base::TimeTicks created_time);
- void InsertNewItemToRaceNetworkRequests(
- int fetch_event_id,
- const base::UnguessableToken& token,
- mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>
- url_loader_factory,
- const KURL& request_url);
- void RemoveItemFromRaceNetworkRequests(int fetch_event_id);
-
Member<ServiceWorkerClients> clients_;
Member<ServiceWorkerRegistration> registration_;
Member<::blink::ServiceWorker> service_worker_;
@@ -776,17 +768,10 @@ class MODULES_EXPORT ServiceWorkerGlobal
blink::BlinkStorageKey storage_key_;
- struct RaceNetworkRequestInfo {
- int fetch_event_id;
- String token;
- mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>
- url_loader_factory;
- };
// TODO(crbug.com/918702) WTF::HashMap cannot use base::UnguessableToken as a
// key. As a workaround uses WTF::String as a key instead.
- HashMap<String, std::unique_ptr<RaceNetworkRequestInfo>>
- race_network_requests_;
- HashMap<int, RaceNetworkRequestInfo*> race_network_request_fetch_event_ids_;
+ HashMap<String, mojo::PendingRemote<network::mojom::blink::URLLoaderFactory>>
+ race_network_request_loader_factories_;
HeapMojoAssociatedRemote<mojom::blink::AssociatedInterfaceProvider>
remote_associated_interfaces_{this};
++++++ chromium-120-lp155-typename.patch ++++++
diff --git a/map_util.h b/map_util.h.new
index 35ce4d7..d0c8247 100644
--- a/base/containers/map_util.h
+++ b/base/containers/map_util.h
@@ -41,8 +41,8 @@ constexpr internal::MappedType<Map>* FindOrNull(Map& map,
const Key& key) {
// to a null value.
template <typename Map,
typename Key,
- typename MappedElementType =
- std::pointer_traits<internal::MappedType<Map>>::element_type>
+ typename MappedElementType =
+ typename
std::pointer_traits<internal::MappedType<Map>>::element_type>
constexpr const MappedElementType* FindPtrOrNull(const Map& map,
const Key& key) {
auto it = map.find(key);
@@ -57,8 +57,8 @@ constexpr const MappedElementType* FindPtrOrNull(const Map&
map,
// to a null value.
template <typename Map,
typename Key,
- typename MappedElementType =
- std::pointer_traits<internal::MappedType<Map>>::element_type>
+ typename MappedElementType =
+ typename
std::pointer_traits<internal::MappedType<Map>>::element_type>
constexpr MappedElementType* FindPtrOrNull(Map& map, const Key& key) {
auto it = map.find(key);
return it != map.end() ? std::to_address(it->second) : nullptr;
diff --git a/async_iterable.h b/async_iterable.h.new
index b4f3b0d..4fff750 100644
--- a/third_party/blink/renderer/bindings/core/v8/async_iterable.h
+++ b/third_party/blink/renderer/bindings/core/v8/async_iterable.h
@@ -220,7 +220,7 @@ class PairAsyncIterable {
private:
virtual IterationSource* CreateIterationSource(
ScriptState* script_state,
- IterationSource::Kind kind,
+ typename IterationSource::Kind kind,
ExceptionState& exception_state) = 0;
};
@@ -262,7 +262,7 @@ class ValueAsyncIterable {
private:
virtual IterationSource* CreateIterationSource(
ScriptState* script_state,
- IterationSource::Kind kind,
+ typename IterationSource::Kind kind,
ExceptionState& exception_state) = 0;
};
++++++ chromium-120-missing-header-files.patch ++++++
Index: chromium-120.0.6099.129/chrome/test/chromedriver/chrome/chrome_finder.h
===================================================================
--- chromium-120.0.6099.129.orig/chrome/test/chromedriver/chrome/chrome_finder.h
+++ chromium-120.0.6099.129/chrome/test/chromedriver/chrome/chrome_finder.h
@@ -6,6 +6,7 @@
#define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_FINDER_H_
#include <vector>
+#include <string>
#include "base/functional/callback_forward.h"
++++++ chromium-119-no_matching_constructor.patch ->
chromium-120-no_matching_constructor.patch ++++++
++++ 626 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/chromium/chromium-119-no_matching_constructor.patch
++++ and
/work/SRC/openSUSE:Factory/.chromium.new.21961/chromium-120-no_matching_constructor.patch
++++++ chromium-119-nullptr_t-without-namespace-std.patch ->
chromium-120-nullptr_t-without-namespace-std.patch ++++++
---
/work/SRC/openSUSE:Factory/chromium/chromium-119-nullptr_t-without-namespace-std.patch
2023-11-13 22:21:38.541207053 +0100
+++
/work/SRC/openSUSE:Factory/.chromium.new.21961/chromium-120-nullptr_t-without-namespace-std.patch
2024-01-14 19:01:51.071828224 +0100
@@ -1,21 +1,27 @@
-diff -up
chromium-119.0.6045.59/third_party/blink/renderer/core/paint/fragment_data_iterator.h.me
chromium-119.0.6045.59/third_party/blink/renderer/core/paint/fragment_data_iterator.h
----
chromium-119.0.6045.59/third_party/blink/renderer/core/paint/fragment_data_iterator.h.me
2023-10-27 20:07:16.421230815 +0200
-+++
chromium-119.0.6045.59/third_party/blink/renderer/core/paint/fragment_data_iterator.h
2023-10-27 20:07:36.883600085 +0200
-@@ -52,7 +52,7 @@ class FragmentDataIterator
- public:
- explicit FragmentDataIterator(const LayoutObject& object)
- : FragmentDataIteratorBase(&object.FirstFragment()) {}
-- explicit FragmentDataIterator(nullptr_t)
-+ explicit FragmentDataIterator(std::nullptr_t)
- : FragmentDataIteratorBase(nullptr) {}
- };
+Index:
chromium-120.0.6099.18/third_party/blink/renderer/core/paint/fragment_data_iterator.h
+===================================================================
+---
chromium-120.0.6099.18.orig/third_party/blink/renderer/core/paint/fragment_data_iterator.h
++++
chromium-120.0.6099.18/third_party/blink/renderer/core/paint/fragment_data_iterator.h
+@@ -21,7 +21,7 @@ class FragmentDataIteratorBase {
-@@ -63,7 +63,7 @@ class MutableFragmentDataIterator
- explicit MutableFragmentDataIterator(const LayoutObject& object)
- : FragmentDataIteratorBase(
- &object.GetMutableForPainting().FirstFragment()) {}
-- explicit MutableFragmentDataIterator(nullptr_t)
-+ explicit MutableFragmentDataIterator(std::nullptr_t)
- : FragmentDataIteratorBase(nullptr) {}
- };
+ public:
+ explicit FragmentDataIteratorBase(Head& head) : fragment_head_(head) {}
+- explicit FragmentDataIteratorBase(nullptr_t) {}
++ explicit FragmentDataIteratorBase(std::nullptr_t) {}
+ Data* GetFragmentData() const {
+ return !IsDone() ? &fragment_head_.at(idx_) : nullptr;
+
+Index:
chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
+===================================================================
+---
chromium-120.0.6099.35.orig/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
++++
chromium-120.0.6099.35/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h
+@@ -184,7 +184,7 @@ struct Arg {
+ //
+ // Warning: don't just do Arg(NULL) here because in some libcs, NULL is an
+ // alias for nullptr!
+- Arg(nullptr_t p) : type(INT) {
++ Arg(std::nullptr_t p) : type(INT) {
+ integer.i = 0;
+ // Internally, SafeSprintf expects to represent nulls as integers whose
+ // width is equal to sizeof(NULL), which is not necessarily equal to
++++++ chromium-117-workaround_clang_bug-structured_binding.patch ->
chromium-120-workaround_clang_bug-structured_binding.patch ++++++
---
/work/SRC/openSUSE:Factory/chromium/chromium-117-workaround_clang_bug-structured_binding.patch
2023-10-08 12:23:11.140657933 +0200
+++
/work/SRC/openSUSE:Factory/.chromium.new.21961/chromium-120-workaround_clang_bug-structured_binding.patch
2024-01-14 19:01:51.099829244 +0100
@@ -1,7 +1,6 @@
-Index: chromium-118.0.5993.18/media/base/cdm_promise_adapter.cc
-===================================================================
---- chromium-118.0.5993.18.orig/media/base/cdm_promise_adapter.cc
-+++ chromium-118.0.5993.18/media/base/cdm_promise_adapter.cc
+diff -up
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc
+---
chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc.workaround_clang_bug-structured_binding
2023-06-07 21:48:37.000000000 +0200
++++ chromium-115.0.5790.24/media/base/cdm_promise_adapter.cc 2023-06-17
16:53:20.216628557 +0200
@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
void CdmPromiseAdapter::Clear(ClearReason reason) {
// Reject all outstanding promises.
@@ -13,84 +12,40 @@
TRACE_EVENT_NESTABLE_ASYNC_END1(
"media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
"status", "cleared");
-Index:
chromium-118.0.5993.18/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
-===================================================================
----
chromium-118.0.5993.18.orig/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
-+++
chromium-118.0.5993.18/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
-@@ -633,8 +633,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
- NGGridSizingTree sizing_tree;
-
- if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree.CreateSizingData();
-+ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- const auto& node = Node();
- grid_items =
-@@ -1837,8 +1839,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
- bool* opt_needs_additional_pass) const {
- DCHECK(sizing_subtree);
-
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_subtree.SubtreeRootData();
-+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- const bool is_for_columns = track_direction == kForColumns;
- const bool has_non_definite_track =
-@@ -1984,8 +1988,10 @@ template <typename CallbackFunc>
- void NGGridLayoutAlgorithm::ForEachSubgrid(
- const NGGridSizingSubtree& sizing_subtree,
- const CallbackFunc& callback_func) const {
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_subtree.SubtreeRootData();
-+ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
-+ auto& grid_items = g_i;
-+ auto& layout_data = l_d;
-+ auto& subtree_size = s_s;
-
- // If we know this subtree doesn't have nested subgrids we can exit early
- // instead of iterating over every grid item looking for them.
-@@ -3452,7 +3458,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+diff -up
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
+---
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc.me
2023-06-19 08:04:02.287072722 +0200
++++
chromium-115.0.5790.32/content/browser/service_worker/service_worker_context_wrapper.cc
2023-06-19 08:18:24.576814950 +0200
+@@ -1393,7 +1393,8 @@ void ServiceWorkerContextWrapper::MaybeP
+ return;
+ }
+
+- auto [document_url, key, callback] = std::move(*request);
++ auto [d_u, key, callback] = std::move(*request);
++ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
+ TRACE_EVENT1("ServiceWorker",
+diff -up
chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me
chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
+---
chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc.me
2023-12-03 22:17:50.922083200 +0100
++++
chromium-120.0.6099.56/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
2023-12-03 22:22:55.437484343 +0100
+@@ -3447,7 +3447,8 @@ void GridLayoutAlgorithm::PlaceGridItems
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& [grid_items, l_d, tree_size] = sizing_tree.TreeRootData();
+ const auto& layout_data = l_d;
-+ const auto& tree_size = t_s;
- const auto* cached_layout_subtree = container_space.GridLayoutSubtree();
+ const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree();
const auto container_writing_direction =
-@@ -3616,7 +3625,10 @@ void NGGridLayoutAlgorithm::PlaceGridIte
+@@ -3611,7 +3612,9 @@ void GridLayoutAlgorithm::PlaceGridItems
// 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& [g_i, l_d, tree_size] = 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* cached_layout_subtree = constraint_space.GetGridLayoutSubtree();
const auto container_writing_direction =
-Index:
chromium-118.0.5993.18/content/browser/service_worker/service_worker_context_wrapper.cc
-===================================================================
----
chromium-118.0.5993.18.orig/content/browser/service_worker/service_worker_context_wrapper.cc
-+++
chromium-118.0.5993.18/content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1409,7 +1409,8 @@ void ServiceWorkerContextWrapper::MaybeP
- return;
- }
-
-- auto [document_url, key, callback] = std::move(*request);
-+ auto [d_u, key, callback] = std::move(*request);
-+ auto document_url = d_u;
-
- DCHECK(document_url.is_valid());
- TRACE_EVENT1("ServiceWorker",
++++++ chromium-119.0.6045.199.tar.xz -> chromium-120.0.6099.216.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-119.0.6045.199.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new.21961/chromium-120.0.6099.216.tar.xz
differ: char 15, line 1
++++++ chromium-disable-GlobalMediaControlsCastStartStop.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:14.266858855 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:14.306860313 +0100
@@ -1,11 +1,11 @@
-Index:
chromium-119.0.6045.21/chrome/browser/media/router/media_router_feature.cc
+Index:
chromium-120.0.6099.18/chrome/browser/media/router/media_router_feature.cc
===================================================================
----
chromium-119.0.6045.21.orig/chrome/browser/media/router/media_router_feature.cc
-+++ chromium-119.0.6045.21/chrome/browser/media/router/media_router_feature.cc
-@@ -75,7 +75,7 @@ BASE_FEATURE(kGlobalMediaControlsCastSta
+---
chromium-120.0.6099.18.orig/chrome/browser/media/router/media_router_feature.cc
++++ chromium-120.0.6099.18/chrome/browser/media/router/media_router_feature.cc
+@@ -74,7 +74,7 @@ BASE_FEATURE(kGlobalMediaControlsCastSta
+ #if BUILDFLAG(IS_CHROMEOS)
+ base::FEATURE_DISABLED_BY_DEFAULT);
#else
- BASE_FEATURE(kGlobalMediaControlsCastStartStop,
- "GlobalMediaControlsCastStartStop",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
#endif // BUILDFLAG(IS_CHROMEOS)
++++++ gcc-enable-lto.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:14.874881005 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:14.914882462 +0100
@@ -1,7 +1,7 @@
-Index: chromium-119.0.6045.21/build/config/BUILDCONFIG.gn
+Index: chromium-120.0.6099.18/build/config/BUILDCONFIG.gn
===================================================================
---- chromium-119.0.6045.21.orig/build/config/BUILDCONFIG.gn
-+++ chromium-119.0.6045.21/build/config/BUILDCONFIG.gn
+--- chromium-120.0.6099.18.orig/build/config/BUILDCONFIG.gn
++++ chromium-120.0.6099.18/build/config/BUILDCONFIG.gn
@@ -135,6 +135,8 @@ declare_args() {
# set "is_official_build" to true for any build intended to ship to
end-users.
is_official_build = false
@@ -24,11 +24,11 @@
if (is_win) {
default_compiler_configs += [
"//build/config/win:default_cfg_compiler",
-Index: chromium-119.0.6045.21/build/config/compiler/BUILD.gn
+Index: chromium-120.0.6099.18/build/config/compiler/BUILD.gn
===================================================================
---- chromium-119.0.6045.21.orig/build/config/compiler/BUILD.gn
-+++ chromium-119.0.6045.21/build/config/compiler/BUILD.gn
-@@ -2297,6 +2297,10 @@ if (is_win) {
+--- chromium-120.0.6099.18.orig/build/config/compiler/BUILD.gn
++++ chromium-120.0.6099.18/build/config/compiler/BUILD.gn
+@@ -2342,6 +2342,10 @@ if (is_win) {
common_optimize_on_cflags += [ "-fno-math-errno" ]
}
@@ -39,10 +39,10 @@
config("default_stack_frames") {
if (!is_win) {
if (enable_frame_pointers) {
-Index: chromium-119.0.6045.21/sandbox/linux/BUILD.gn
+Index: chromium-120.0.6099.18/sandbox/linux/BUILD.gn
===================================================================
---- chromium-119.0.6045.21.orig/sandbox/linux/BUILD.gn
-+++ chromium-119.0.6045.21/sandbox/linux/BUILD.gn
+--- chromium-120.0.6099.18.orig/sandbox/linux/BUILD.gn
++++ chromium-120.0.6099.18/sandbox/linux/BUILD.gn
@@ -253,6 +253,9 @@ component("seccomp_bpf") {
"//build:chromeos_buildflags",
"//sandbox:sandbox_buildflags",
@@ -53,11 +53,11 @@
if (is_android) {
sources += [
-Index: chromium-119.0.6045.21/base/BUILD.gn
+Index: chromium-120.0.6099.18/base/BUILD.gn
===================================================================
---- chromium-119.0.6045.21.orig/base/BUILD.gn
-+++ chromium-119.0.6045.21/base/BUILD.gn
-@@ -3808,6 +3808,10 @@ test("base_unittests") {
+--- chromium-120.0.6099.18.orig/base/BUILD.gn
++++ chromium-120.0.6099.18/base/BUILD.gn
+@@ -3830,6 +3830,10 @@ test("base_unittests") {
}
}
@@ -67,5 +67,5 @@
+
if (use_partition_alloc) {
sources += [
- "allocator/partition_allocator/address_pool_manager_unittest.cc",
+
"allocator/partition_allocator/src/partition_alloc/address_pool_manager_unittest.cc",
++++++ gcc13-fix.patch ++++++
--- /var/tmp/diff_new_pack.m94BBj/_old 2024-01-14 19:03:15.058887708 +0100
+++ /var/tmp/diff_new_pack.m94BBj/_new 2024-01-14 19:03:15.086888727 +0100
@@ -1,7 +1,7 @@
-Index: chromium-117.0.5938.22/base/check_op.h
+Index: chromium-120.0.6099.18/base/check_op.h
===================================================================
---- chromium-117.0.5938.22.orig/base/check_op.h
-+++ chromium-117.0.5938.22/base/check_op.h
+--- chromium-120.0.6099.18.orig/base/check_op.h
++++ chromium-120.0.6099.18/base/check_op.h
@@ -5,6 +5,7 @@
#ifndef BASE_CHECK_OP_H_
#define BASE_CHECK_OP_H_
@@ -10,10 +10,10 @@
#include <cstddef>
#include <string>
#include <string_view>
-Index: chromium-117.0.5938.22/base/debug/profiler.h
+Index: chromium-120.0.6099.18/base/debug/profiler.h
===================================================================
---- chromium-117.0.5938.22.orig/base/debug/profiler.h
-+++ chromium-117.0.5938.22/base/debug/profiler.h
+--- chromium-120.0.6099.18.orig/base/debug/profiler.h
++++ chromium-120.0.6099.18/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-117.0.5938.22/gpu/config/gpu_feature_info.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/gpu/config/gpu_feature_info.h
++++ chromium-120.0.6099.18/gpu/config/gpu_feature_info.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -34,10 +34,10 @@
#include <string>
#include <vector>
-Index: chromium-117.0.5938.22/net/base/net_export.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/net/base/net_export.h
++++ chromium-120.0.6099.18/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-117.0.5938.22/sandbox/linux/syscall_broker/broker_file_permission.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/sandbox/linux/syscall_broker/broker_file_permission.h
++++
chromium-120.0.6099.18/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-117.0.5938.22/third_party/abseil-cpp/absl/strings/string_view.h
+Index: chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/abseil-cpp/absl/strings/string_view.h
++++ chromium-120.0.6099.18/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-117.0.5938.22/third_party/angle/include/GLSLANG/ShaderVars.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/third_party/angle/include/GLSLANG/ShaderVars.h
++++ chromium-120.0.6099.18/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-117.0.5938.22/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
++++
chromium-120.0.6099.18/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -95,10 +95,10 @@
#include <array>
#include <cstdint>
#include <functional>
-Index:
chromium-117.0.5938.22/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
++++
chromium-120.0.6099.18/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -107,10 +107,10 @@
#include <functional>
#include <map>
#include <set>
-Index: chromium-117.0.5938.22/third_party/swiftshader/src/System/LRUCache.hpp
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/third_party/swiftshader/src/System/LRUCache.hpp
++++ chromium-120.0.6099.18/third_party/swiftshader/src/System/LRUCache.hpp
@@ -17,6 +17,7 @@
#include "System/Debug.hpp"
@@ -119,22 +119,10 @@
#include <cstddef>
#include <cstdint>
#include <functional>
-Index:
chromium-117.0.5938.22/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
+Index: chromium-120.0.6099.18/ui/gfx/geometry/linear_gradient.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
-
-+#include <cstdio>
- #include <cstdint>
- #include <cstdlib>
- #include <cstring>
-Index: chromium-117.0.5938.22/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
+--- chromium-120.0.6099.18.orig/ui/gfx/geometry/linear_gradient.h
++++ chromium-120.0.6099.18/ui/gfx/geometry/linear_gradient.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -143,10 +131,10 @@
#include <array>
#include <cstddef>
#include <cstdint>
-Index:
chromium-117.0.5938.22/third_party/ruy/src/ruy/profiler/instrumentation.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/ruy/src/ruy/profiler/instrumentation.h
++++ chromium-120.0.6099.18/third_party/ruy/src/ruy/profiler/instrumentation.h
@@ -17,6 +17,7 @@ limitations under the License.
#define RUY_RUY_PROFILER_INSTRUMENTATION_H_
@@ -155,10 +143,10 @@
#include <cstdio>
#include <mutex>
#include <vector>
-Index:
chromium-117.0.5938.22/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.h
++++
chromium-120.0.6099.18/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_
@@ -167,10 +155,10 @@
#include <complex>
#include <deque>
#include <vector>
-Index: chromium-117.0.5938.22/base/containers/flat_map.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/base/containers/flat_map.h
++++ chromium-120.0.6099.18/base/containers/flat_map.h
@@ -5,6 +5,7 @@
#ifndef BASE_CONTAINERS_FLAT_MAP_H_
#define BASE_CONTAINERS_FLAT_MAP_H_
@@ -179,10 +167,10 @@
#include <functional>
#include <tuple>
#include <type_traits>
-Index: chromium-117.0.5938.22/components/crash/core/app/crash_reporter_client.h
+Index: chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/crash/core/app/crash_reporter_client.h
++++ chromium-120.0.6099.18/components/crash/core/app/crash_reporter_client.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -191,10 +179,10 @@
#include <string>
#include "build/build_config.h"
-Index: chromium-117.0.5938.22/ui/base/prediction/kalman_filter.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/ui/base/prediction/kalman_filter.h
++++ chromium-120.0.6099.18/ui/base/prediction/kalman_filter.h
@@ -7,6 +7,8 @@
#include <stdint.h>
@@ -204,10 +192,10 @@
#include "base/component_export.h"
#include "ui/gfx/geometry/matrix3_f.h"
-Index:
chromium-117.0.5938.22/components/password_manager/core/browser/generation/password_generator.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/password_manager/core/browser/generation/password_generator.h
++++
chromium-120.0.6099.18/components/password_manager/core/browser/generation/password_generator.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -216,10 +204,10 @@
#include <string>
-Index:
chromium-117.0.5938.22/components/feature_engagement/internal/event_storage_validator.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/feature_engagement/internal/event_storage_validator.h
++++
chromium-120.0.6099.18/components/feature_engagement/internal/event_storage_validator.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -228,10 +216,10 @@
#include <string>
namespace feature_engagement {
-Index:
chromium-117.0.5938.22/components/feature_engagement/internal/never_event_storage_validator.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/feature_engagement/internal/never_event_storage_validator.h
++++
chromium-120.0.6099.18/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_
@@ -240,10 +228,10 @@
#include <string>
#include "components/feature_engagement/internal/event_storage_validator.h"
-Index:
chromium-117.0.5938.22/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/swiftshader/third_party/llvm-10.0/llvm/lib/Support/Unix/Signals.inc
++++
chromium-120.0.6099.18/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"
@@ -252,10 +240,10 @@
#include <string>
#include <sysexits.h>
#ifdef HAVE_BACKTRACE
-Index:
chromium-117.0.5938.22/chrome/browser/privacy_budget/encountered_surface_tracker.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/chrome/browser/privacy_budget/encountered_surface_tracker.h
++++
chromium-120.0.6099.18/chrome/browser/privacy_budget/encountered_surface_tracker.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -264,10 +252,10 @@
#include <map>
#include "base/containers/flat_set.h"
-Index:
chromium-117.0.5938.22/components/autofill/core/browser/autofill_ablation_study.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/autofill/core/browser/autofill_ablation_study.h
++++
chromium-120.0.6099.18/components/autofill/core/browser/autofill_ablation_study.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -276,10 +264,10 @@
#include <string>
class GURL;
-Index: chromium-117.0.5938.22/components/omnibox/browser/on_device_head_model.h
+Index: chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/omnibox/browser/on_device_head_model.h
++++ chromium-120.0.6099.18/components/omnibox/browser/on_device_head_model.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -288,10 +276,10 @@
#include <string>
#include <utility>
#include <vector>
-Index:
chromium-117.0.5938.22/components/payments/content/utility/fingerprint_parser.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/components/payments/content/utility/fingerprint_parser.h
++++
chromium-120.0.6099.18/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_
@@ -300,10 +288,10 @@
#include <stddef.h>
#include <stdint.h>
-Index: chromium-117.0.5938.22/pdf/document_attachment_info.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/pdf/document_attachment_info.h
++++ chromium-120.0.6099.18/pdf/document_attachment_info.h
@@ -7,6 +7,7 @@
#include <stdint.h>
@@ -312,10 +300,10 @@
#include <string>
-Index: chromium-117.0.5938.22/third_party/pdfium/constants/annotation_flags.h
+Index: chromium-120.0.6099.18/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
+--- chromium-120.0.6099.18.orig/third_party/pdfium/constants/annotation_flags.h
++++ chromium-120.0.6099.18/third_party/pdfium/constants/annotation_flags.h
@@ -7,6 +7,8 @@
#include <stdint.h>
@@ -325,10 +313,10 @@
namespace pdfium {
namespace annotation_flags {
-Index:
chromium-117.0.5938.22/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
++++
chromium-120.0.6099.18/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.
@@ -337,10 +325,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-117.0.5938.22/chrome/browser/webauthn/authenticator_request_dialog_model.h
+Index:
chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/chrome/browser/webauthn/authenticator_request_dialog_model.h
++++
chromium-120.0.6099.18/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -8,6 +8,7 @@
#include <memory>
#include <string>
@@ -349,10 +337,10 @@
#include "base/containers/span.h"
#include "base/functional/callback_forward.h"
-Index: chromium-117.0.5938.22/gin/time_clamper.h
+Index: chromium-120.0.6099.18/gin/time_clamper.h
===================================================================
---- chromium-117.0.5938.22.orig/gin/time_clamper.h
-+++ chromium-117.0.5938.22/gin/time_clamper.h
+--- chromium-120.0.6099.18.orig/gin/time_clamper.h
++++ chromium-120.0.6099.18/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
@@ -362,10 +350,10 @@
return now_micros / 1000;
}
return ClampTimeResolution(now_micros) / 1000;
-Index: chromium-117.0.5938.22/chrome/test/chromedriver/chrome/web_view_impl.cc
+Index: chromium-120.0.6099.18/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
+---
chromium-120.0.6099.18.orig/chrome/test/chromedriver/chrome/web_view_impl.cc
++++ chromium-120.0.6099.18/chrome/test/chromedriver/chrome/web_view_impl.cc
@@ -11,6 +11,7 @@
#include <queue>
#include <utility>
