Skip to content

Commit 82e2184

Browse files
chromium: update to 118.0.5993.117 (OSSystems#768)
Release notes: https://chromereleases.googleblog.com/2023/10/stable-channel-update-for-desktop_10.html https://chromereleases.googleblog.com/2023/10/stable-channel-update-for-desktop_17.html https://chromereleases.googleblog.com/2023/10/stable-channel-update-for-desktop_24.html Build and patch changes: ------------------------ Drop one backported patch that's included upstream now, and add five new backports. Update 0008-drop-gsimple-template-names.patch to use upstream's new GN arg that controls whether `-gsimple-template-names` is used. Drop one fix from 0015-Avoid-capturing-structured-bindings.patch where the code that needed fixing was removed upstream. Add two more fixes to 0017-Avoid-parenthesized-initialization-of-aggregates.patch. Rebase remaining patches. License changes: ---------------- Added licenses: * ios/components/third_party/compiler-rt/LICENSE.TXT - https://chromium-review.googlesource.com/c/chromium/src/+/4833951 * third_party/fuchsia-gn-sdk/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4492524, * third_party/libva_protected_content/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2523100 * third_party/updater/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3924483 Removed licenses: none. Updated licenses: none. Test-built (big thanks to @nrpt-m): ----------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - mickledore, clang, MACHINE=qemuarm64, qemux86-64 - kirkstone, clang, MACHINE=qemux86-64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64 * chromium-x11 - master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - mickledore, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - kirkstone, clang, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64 - dunfell, clang**, MACHINE=qemux86-64, qemuarm, qemuarm64, raspberrypi4-64*** ** Please note that Chromium requires below set-up when on dunfell branch. - The clang version to be >= 14 and for that, use the latest meta-clang/dunfell-clang14 branch. - Require the latest meta-oe with Nodejs 14.x support. - Add the PREFERRED_VERSION_nodejs-native = "14.%" in conf/local.conf file. *** Please note that there currently is a problem on RPi4/dunfell where Chromium crashes because of an illegal instruction error. Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent d5542fc commit 82e2184

29 files changed

+358
-168
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
1414
SRC_URI += "\
15-
file://backport/IWYU-for-chromedriver-chrome-client_hints.h.patch \
1615
file://backport/IWYU-for-ui-events-gesture_detection-motion.patch \
1716
file://backport/Remove-std-ranges-usage.patch \
17+
file://backport/lacros-Include-string_view-from-net-cert-pk.patch \
18+
file://backport/IWYU-Add-includes-for-size_t-and-int64_t-us.patch \
19+
file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \
20+
file://backport/Initialize-ServerCvc-with-designated-initia.patch \
21+
file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \
1822
"
1923
# Non-specific patches.
2024
SRC_URI += "\

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead"
7+
SRC_URI[sha256sum] = "7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786"
88

99
S = "${WORKDIR}/chromium-${PV}"
1010

@@ -79,6 +79,7 @@ LIC_FILES_CHKSUM = "\
7979
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
8080
file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \
8181
file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \
82+
file://${S}/ios/components/third_party/compiler-rt/LICENSE.TXT;md5=67ce57844c93575886f0099fa1bf95cd \
8283
file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \
8384
file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \
8485
file://${S}/ios/third_party/material_components_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -265,6 +266,7 @@ LIC_FILES_CHKSUM = "\
265266
file://${S}/third_party/fontconfig/src/COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \
266267
file://${S}/third_party/fp16/LICENSE;md5=855dd24c28c76c916c5c2301b1958728 \
267268
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
269+
file://${S}/third_party/fuchsia-gn-sdk/LICENSE;md5=4c8b7c5e9d0a48795db3dcd70f738ea5 \
268270
file://${S}/third_party/fusejs/LICENSE;md5=f61de6d0d3d200550e44d63cc2a4fb67 \
269271
file://${S}/third_party/fxdiv/src/LICENSE;md5=0c2eed7ba400a6fea8fec2a582b177e8 \
270272
file://${S}/third_party/gemmlowp/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -314,6 +316,7 @@ LIC_FILES_CHKSUM = "\
314316
file://${S}/third_party/libunwind/src/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
315317
file://${S}/third_party/liburlpattern/LICENSE;md5=5be7cac9f8920c488c4dda56dbfeaec2 \
316318
file://${S}/third_party/libusb/src/COPYING;md5=fbc093901857fcd118f065f900982c24 \
319+
file://${S}/third_party/libva_protected_content/LICENSE;md5=2e48940f94acb0af582e5ef03537800f \
317320
file://${S}/third_party/libvpx/source/libvpx/LICENSE;md5=d5b04755015be901744a78cc30d390d4 \
318321
file://${S}/third_party/libwebm/source/LICENSE.TXT;md5=6e8dee932c26f2dab503abf70c96d8bb \
319322
file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \
@@ -380,6 +383,7 @@ LIC_FILES_CHKSUM = "\
380383
file://${S}/third_party/tflite_support/LICENSE;md5=e03a906d141508f60cbe30013b8d064b \
381384
file://${S}/third_party/ukey2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
382385
file://${S}/third_party/unrar/src/license.txt;md5=fc9c335ec05a5f36764ef9ce7a79daa1 \
386+
file://${S}/third_party/updater/LICENSE;md5=cae49083c47e95af08185adc3852b104 \
383387
file://${S}/third_party/usb_ids/LICENSE;md5=8f694e3758e3e57a5223bfa2bf29d452 \
384388
file://${S}/third_party/utf/LICENSE;md5=b940b7cb006a9c3a53ac180bdbe41473 \
385389
file://${S}/third_party/v4l-utils/COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0 \

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Signed-off-by: Maksim Sisov <[email protected]>
1717
2 files changed, 11 insertions(+), 6 deletions(-)
1818

1919
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
20-
index 46a1fce..6fc1c04 100644
20+
index 06812fb..2a810d9 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -712,7 +712,7 @@ config("compiler") {
23+
@@ -721,7 +721,7 @@ config("compiler") {
2424

2525
if (is_win) {
2626
ldflags += [
@@ -29,7 +29,7 @@ index 46a1fce..6fc1c04 100644
2929
"-mllvm:-import-instr-limit=$import_instr_limit",
3030
"/lldltocache:" +
3131
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
32-
@@ -726,11 +726,11 @@ config("compiler") {
32+
@@ -735,11 +735,11 @@ config("compiler") {
3333
# usage in crbug.com/1038040. Note this will increase build time in
3434
# Chrome OS.
3535

meta-chromium/recipes-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <[email protected]>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 6fc1c04..3ebd975 100644
24+
index 2a810d9..f991efd 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1108,11 +1108,6 @@ config("compiler_cpu_abi") {
27+
@@ -1112,11 +1112,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 6fc1c04..3ebd975 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1122,12 +1117,6 @@ config("compiler_cpu_abi") {
39+
@@ -1126,12 +1121,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 6fc1c04..3ebd975 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1135,9 +1124,6 @@ config("compiler_cpu_abi") {
52+
@@ -1139,9 +1128,6 @@ config("compiler_cpu_abi") {
5353
if (is_android) {
5454
cflags += [ "--target=mipsel-linux-android" ]
5555
ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index 6fc1c04..3ebd975 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1217,8 +1203,6 @@ config("compiler_cpu_abi") {
62+
@@ -1221,8 +1207,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 6fc1c04..3ebd975 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1266,9 +1250,6 @@ config("compiler_cpu_abi") {
71+
@@ -1270,9 +1254,6 @@ config("compiler_cpu_abi") {
7272
if (is_android) {
7373
cflags += [ "--target=mips64el-linux-android" ]
7474
ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index 6fc1c04..3ebd975 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1326,8 +1307,6 @@ config("compiler_cpu_abi") {
81+
@@ -1330,8 +1311,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 6fc1c04..3ebd975 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1490,23 +1469,6 @@ config("compiler_deterministic") {
90+
@@ -1494,23 +1473,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index ca081a7..e21336e 100644
32+
index dd97c4f..c3961b0 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2124,6 +2124,7 @@ template("run_torque") {
35+
@@ -2137,6 +2137,7 @@ template("run_torque") {
3636
}
3737

3838
args = [
3939
+ "./v8-qemu-wrapper.sh",
4040
"./" + rebase_path(
4141
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4242
root_build_dir),
43-
@@ -2269,6 +2270,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2294,6 +2295,7 @@ action("generate_bytecode_builtins_list") {
4444
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4545
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4646
args = [
4747
+ "./v8-qemu-wrapper.sh",
4848
"./" + rebase_path(
4949
get_label_info(
5050
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -2308,6 +2310,7 @@ template("run_mksnapshot") {
51+
@@ -2333,6 +2335,7 @@ template("run_mksnapshot") {
5252
data = []
5353

5454
args = [
5555
+ "./v8-qemu-wrapper.sh",
5656
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5757
"root_out_dir") + "/mksnapshot",
5858
root_build_dir),
59-
@@ -6852,6 +6855,7 @@ if (v8_enable_i18n_support) {
59+
@@ -6882,6 +6885,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0005-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index ebaa4fa..1e9f4e7 100644
16+
index f991efd..0b69949 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1711,6 +1711,11 @@ config("default_warnings") {
19+
@@ -1735,6 +1735,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0006-avoid-link-latomic-failure-on-CentOS-8-host.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 6e6f24e..764f133 100644
21+
index 82cb596..5eb1a6d 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1112,7 +1112,9 @@ component("base") {
24+
@@ -1111,7 +1111,9 @@ component("base") {
2525
# Needed for <atomic> if using newer C++ library than sysroot, except if
2626
# building inside the cros_sdk environment - use host_toolchain as a
2727
# more robust check for this.

meta-chromium/recipes-browser/chromium/files/0007-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ Signed-off-by: Max Ihlenfeldt <[email protected]>
2424
2 files changed, 11 insertions(+), 17 deletions(-)
2525

2626
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
27-
index 1e9f4e7..7c9a46e 100644
27+
index 0b69949..00fa15a 100644
2828
--- a/build/config/compiler/BUILD.gn
2929
+++ b/build/config/compiler/BUILD.gn
30-
@@ -1398,7 +1398,6 @@ config("compiler_codegen") {
30+
@@ -1412,7 +1412,6 @@ config("compiler_codegen") {
3131
config("compiler_deterministic") {
3232
cflags = []
3333
ldflags = []
3434
- swiftflags = []
3535

3636
# Eliminate build metadata (__DATE__, __TIME__ and __TIMESTAMP__) for
3737
# deterministic build. See https://crbug.com/314403
38-
@@ -1427,20 +1426,12 @@ config("compiler_deterministic") {
38+
@@ -1441,20 +1440,12 @@ config("compiler_deterministic") {
3939
# different build directory like "out/feature_a" and "out/feature_b" if
4040
# we build same files with same compile flag.
4141
# Other paths are already given in relative, no need to normalize them.

meta-chromium/recipes-browser/chromium/files/0008-drop-gsimple-template-names.patch

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,22 @@ Upstream-Status: Inappropriate clang-12 only.
77
Signed-off-by: Randy MacLeod <[email protected]>
88

99
---
10-
build/config/compiler/BUILD.gn | 8 +++++---
11-
1 file changed, 5 insertions(+), 3 deletions(-)
10+
build/config/compiler/BUILD.gn | 5 ++++-
11+
1 file changed, 4 insertions(+), 1 deletion(-)
1212

1313
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
14-
index 7c9a46e..52ad177 100644
14+
index 06812fb..bc29b94 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -866,9 +866,11 @@ config("compiler") {
18-
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
19-
# lldb doesn't have the needed changes yet.
20-
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
21-
- if (is_clang && !is_nacl && !is_win && !is_apple) {
22-
- cflags_cc += [ "-gsimple-template-names" ]
23-
- }
24-
+ # Drop for 109 due to dunfell:
25-
+ # clang-12: error: unknown argument: '-gsimple-template-names'
26-
+ #if (is_clang && !is_nacl && !is_win && !is_apple) {
27-
+ # cflags_cc += [ "-gsimple-template-names" ]
28-
+ #}
17+
@@ -192,7 +192,10 @@ declare_args() {
18+
# This greatly reduces the size of debug builds, at the cost of
19+
# debugging information which is required by some specialized
20+
# debugging tools.
21+
- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
22+
+ #
23+
+ # Disabled because the version of clang used on dunfell doesn't recognize the
24+
+ # argument.
25+
+ simple_template_names = false
26+
}
2927

30-
# MLGO specific flags. These flags enable an ML-based inliner trained on
31-
# Chrome on Android (arm32) with ThinLTO enabled, optimizing for size.
28+
declare_args() {

meta-chromium/recipes-browser/chromium/files/0009-cast-to-bool-to-avoid-constexpr-error.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Randy MacLeod <[email protected]>
1111
1 file changed, 3 insertions(+), 3 deletions(-)
1212

1313
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
14-
index d2fde96..a64d6fc 100644
14+
index d752a7b..3f05a1b 100644
1515
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
1616
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
1717
@@ -3732,15 +3732,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(

meta-chromium/recipes-browser/chromium/files/0011-Only-default-operator-on-declaration.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ index 5bf889f..946eabe 100644
6161

6262
AffiliationFetcherInterface() = default;
6363
diff --git a/components/password_manager/core/browser/passkey_credential.cc b/components/password_manager/core/browser/passkey_credential.cc
64-
index 1939e54..b3d57f0 100644
64+
index 9c79b70..2a88233 100644
6565
--- a/components/password_manager/core/browser/passkey_credential.cc
6666
+++ b/components/password_manager/core/browser/passkey_credential.cc
67-
@@ -96,7 +96,4 @@ std::u16string PasskeyCredential::GetAuthenticatorLabel() const {
67+
@@ -99,7 +99,4 @@ std::u16string PasskeyCredential::GetAuthenticatorLabel() const {
6868
return l10n_util::GetStringUTF16(id);
6969
}
7070

@@ -73,10 +73,10 @@ index 1939e54..b3d57f0 100644
7373
-
7474
} // namespace password_manager
7575
diff --git a/components/password_manager/core/browser/passkey_credential.h b/components/password_manager/core/browser/passkey_credential.h
76-
index 42bf392..fcb53a7 100644
76+
index 6549ca5..faa9da9 100644
7777
--- a/components/password_manager/core/browser/passkey_credential.h
7878
+++ b/components/password_manager/core/browser/passkey_credential.h
79-
@@ -75,8 +75,7 @@ class PasskeyCredential {
79+
@@ -76,8 +76,7 @@ class PasskeyCredential {
8080
const std::string& display_name() const { return display_name_; }
8181

8282
private:
@@ -86,7 +86,7 @@ index 42bf392..fcb53a7 100644
8686

8787
// Authenticator type this passkey belongs to.
8888
Source source_;
89-
@@ -106,8 +105,6 @@ class PasskeyCredential {
89+
@@ -107,8 +106,6 @@ class PasskeyCredential {
9090
absl::optional<std::u16string> authenticator_label_;
9191
};
9292

@@ -96,10 +96,10 @@ index 42bf392..fcb53a7 100644
9696

9797
#endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSKEY_CREDENTIAL_H_
9898
diff --git a/components/password_manager/core/browser/password_form.cc b/components/password_manager/core/browser/password_form.cc
99-
index d4976fa..6161547 100644
99+
index 3dac412..f60b23f 100644
100100
--- a/components/password_manager/core/browser/password_form.cc
101101
+++ b/components/password_manager/core/browser/password_form.cc
102-
@@ -239,8 +239,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =
102+
@@ -242,8 +242,6 @@ AlternativeElement& AlternativeElement::operator=(AlternativeElement&& rhs) =
103103

104104
AlternativeElement::~AlternativeElement() = default;
105105

@@ -109,10 +109,10 @@ index d4976fa..6161547 100644
109109
return std::tie(value, field_renderer_id, name) <
110110
std::tie(other.value, other.field_renderer_id, other.name);
111111
diff --git a/components/password_manager/core/browser/password_form.h b/components/password_manager/core/browser/password_form.h
112-
index cdda601..3b58eaf 100644
112+
index a27301f..c2597aa 100644
113113
--- a/components/password_manager/core/browser/password_form.h
114114
+++ b/components/password_manager/core/browser/password_form.h
115-
@@ -44,7 +44,7 @@ struct AlternativeElement {
115+
@@ -45,7 +45,7 @@ struct AlternativeElement {
116116
AlternativeElement& operator=(AlternativeElement&& rhs);
117117
~AlternativeElement();
118118

0 commit comments

Comments
 (0)