Skip to content

Commit b279a4d

Browse files
committed
chromium: update to 113.0.5672.126
Release notes: https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop_8.html https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop_16.html Build and patch changes: ------------------------ Drop 0009-nomerge-attribute-on-declaration-is-only-available-s.patch as all supported Yocto releases use clang >= 12 by now. Drop 0013-Fix-html_minifier-script-for-node-v12.patch as all supported Yocto releases use Node >= 14 by now. Revert an upstream change that allows mixing `__attribute__` and `alignas` syntax, because older versions of clang still used by some Yocto releases don't like that very much. Add 0021-Add-missing-typename-s.patch to fix a compile error. Backport various patches to fix compile errors: 0019-Backport-constexpr-std-string-fixes.patch 0022-Backport-Avoid-capturing-structured-bindings.patch 0023-Backport-IWYU-for-translate-TranslateUILanguagesMana.patch 0024-Backport-Fix-erroneous-SupportsOstreamOperator-int-i.patch 0025-Backport-Do-not-use-std-monospace-for-absl-variant.patch 0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch Rebase remaining patches. License changes: ---------------- Added licenses: * chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4296260 * third_party/cros-components/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4295996 * third_party/libei/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4221794 Removed licenses: * third_party/android_rust_toolchain/toolchain/share/doc/rust/LICENSE-APACHE - Not sure what change caused the removal, but I suppose something in the third-party checkout logic changed so that this isn't checked out for non-Android configurations. Updated licenses: * third_party/libjpeg_turbo/LICENSE.md - https://chromium-review.googlesource.com/c/chromium/deps/libjpeg_turbo/+/3500634, https://chromium-review.googlesource.com/c/chromium/deps/libjpeg_turbo/+/4219963 Test-built: ----------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - mickledore, clang, MACHINE=qemux86-64 - langdale, clang, MACHINE=qemuarm64 - kirkstone, clang, MACHINE=raspberrypi3, qemux86-64 - dunfell, clang**, MACHINE=qemux86-64 * chromium-x11 - master, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm - mickledore, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm - kirkstone, clang, MACHINE=raspberrypi4-64, qemux86-64, qemuarm64, qemuarm - dunfell, clang**, MACHINE=raspberrypi3, raspberrypi4-64***, qemux86-64, qemuarm64, qemuarm ** Please note that Chromium requires below set-up when on dunfell branch. - The clang version to be >= 12 and for that, use the latest meta-clang/dunfell-clang12 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's network service crashes. Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 633dbee commit b279a4d

24 files changed

+2666
-112
lines changed

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ SRC_URI += " \
1818
file://0005-BUILD-do-not-specify-march-on-arm.patch \
1919
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
2020
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
21-
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
2221
file://0011-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
23-
file://0013-Fix-html_minifier-script-for-node-v12.patch \
2422
file://0015-drop-gsimple-template-names.patch \
2523
file://0016-cast-to-bool-to-avoid-constexpr-error.patch \
2624
file://0017-Revert-Fix-std-span-autodetection-7805.patch \
2725
file://0018-Only-default-operator-on-declaration.patch \
26+
file://0019-Backport-constexpr-std-string-fixes.patch \
27+
file://0020-Revert-__attribute__-and-alignas-changes.patch \
28+
file://0021-Add-missing-typename-s.patch \
29+
file://0022-Backport-Avoid-capturing-structured-bindings.patch \
30+
file://0023-Backport-IWYU-for-translate-TranslateUILanguagesMana.patch \
31+
file://0024-Backport-Fix-erroneous-SupportsOstreamOperator-int-i.patch \
32+
file://0025-Backport-Do-not-use-std-monospace-for-absl-variant.patch \
33+
file://0026-Backport-std-string-ends_with-is-C-20.-Use-base-Ends.patch \
2834
"
2935

3036
SRC_URI:append:libc-musl = "\

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

+5-3
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] = "168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd"
7+
SRC_URI[sha256sum] = "0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93"
88

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

@@ -72,6 +72,7 @@ LIC_FILES_CHKSUM = "\
7272
file://${S}/buildtools/third_party/libc++/trunk/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
7373
file://${S}/buildtools/third_party/libc++abi/trunk/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
7474
file://${S}/buildtools/third_party/libunwind/trunk/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
75+
file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \
7576
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
7677
file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=8bbde65ae0523dc878ed1ac1252d2d14 \
7778
file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \
@@ -200,7 +201,6 @@ LIC_FILES_CHKSUM = "\
200201
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
201202
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
202203
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
203-
file://${S}/third_party/android_rust_toolchain/toolchain/share/doc/rust/LICENSE-APACHE;md5=22a53954e4e0ec258dfce4391e905dac \
204204
file://${S}/third_party/android_sdk/LICENSE;md5=a9559ed17808a8b10eec6672f993ce75 \
205205
file://${S}/third_party/android_swipe_refresh/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
206206
file://${S}/third_party/android_system_sdk/LICENSE;md5=cbb64e76df0f98fc138b1918c089417e \
@@ -230,6 +230,7 @@ LIC_FILES_CHKSUM = "\
230230
file://${S}/third_party/cpuinfo/src/LICENSE;md5=cabca80e8e4a4bbe90e9a4b4ad53f5f4 \
231231
file://${S}/third_party/crashpad/crashpad/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
232232
file://${S}/third_party/crc32c/src/LICENSE;md5=e9ed01b5e5ac9eae23fc2bb33701220c \
233+
file://${S}/third_party/cros-components/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
233234
file://${S}/third_party/crubit/LICENSE;md5=e8237eb3ff53402dada6d65b7640b60b \
234235
file://${S}/third_party/d3/src/LICENSE;md5=0679931d76eb2f1dd1915249da84a722 \
235236
file://${S}/third_party/dav1d/LICENSE;md5=59cb7015cbeea4a8675b9bdb657d41b3 \
@@ -295,11 +296,12 @@ LIC_FILES_CHKSUM = "\
295296
file://${S}/third_party/libaom/source/libaom/LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \
296297
file://${S}/third_party/libavif/LICENSE;md5=15744a27d810133340dc64ad411ec4cd \
297298
file://${S}/third_party/libbrlapi/LICENSE;md5=fad9b3332be894bab9bc501572864b29 \
299+
file://${S}/third_party/libei/LICENSE;md5=a98fa76460f96f41696611d6f07e8d49 \
298300
file://${S}/third_party/libevent/LICENSE;md5=a2b0302a710150293fb85d2bfabd3de6 \
299301
file://${S}/third_party/libgav1/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
300302
file://${S}/third_party/libipp/LICENSE;md5=af9e58383a1b2b17c75c6c9ff561ca9d \
301303
file://${S}/third_party/libjingle_xmpp/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
302-
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \
304+
file://${S}/third_party/libjpeg_turbo/LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \
303305
file://${S}/third_party/liblouis/LICENSE;md5=8ab69863de0d3a0e00c4f97a4d78dd4a \
304306
file://${S}/third_party/libphonenumber/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
305307
file://${S}/third_party/libpng/LICENSE;md5=b0085051bf265bac2bfc38bc89f50000 \

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

+5-5
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 9afb4425840b9..6c38d4fa27855 100644
20+
index d3adf9735ca95..bbe807fdc7b04 100644
2121
--- a/build/config/compiler/BUILD.gn
2222
+++ b/build/config/compiler/BUILD.gn
23-
@@ -685,7 +685,7 @@ config("compiler") {
23+
@@ -680,7 +680,7 @@ config("compiler") {
2424

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

@@ -44,8 +44,8 @@ index 9afb4425840b9..6c38d4fa27855 100644
4444
+ ldflags += [ "-Wl,--thinlto-jobs=" + max_jobs_per_link ]
4545
+
4646
if (is_apple) {
47-
_object_path_suffix = ""
48-
if (is_ios) {
47+
ldflags += [
48+
"-Wl,-cache_path_lto," +
4949
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
5050
index 4738ee80d307c..7a43b1113a495 100644
5151
--- a/build/config/compiler/compiler.gni

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

+8-8
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 6c38d4fa27855..7bae0340ede9a 100644
24+
index bbe807fdc7b04..ca70a35b4d269 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1009,11 +1009,6 @@ config("compiler_cpu_abi") {
27+
@@ -996,11 +996,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1023,12 +1018,6 @@ config("compiler_cpu_abi") {
39+
@@ -1010,12 +1005,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1036,9 +1025,6 @@ config("compiler_cpu_abi") {
52+
@@ -1023,9 +1012,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 6c38d4fa27855..7bae0340ede9a 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1118,8 +1104,6 @@ config("compiler_cpu_abi") {
62+
@@ -1105,8 +1091,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1167,9 +1151,6 @@ config("compiler_cpu_abi") {
71+
@@ -1154,9 +1138,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 6c38d4fa27855..7bae0340ede9a 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1227,8 +1208,6 @@ config("compiler_cpu_abi") {
81+
@@ -1214,8 +1195,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 6c38d4fa27855..7bae0340ede9a 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1391,23 +1370,6 @@ config("compiler_deterministic") {
90+
@@ -1378,23 +1357,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ index 52504f4f6f009..40425d63454f3 100644
2929
"root_out_dir") +
3030
"/v8_context_snapshot_generator",
3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 277f47717da..acdb09bf9ae 100644
32+
index 8f937794079..3f4071e0c88 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2007,6 +2007,7 @@ template("run_torque") {
35+
@@ -2012,6 +2012,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-
@@ -2139,6 +2140,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2144,6 +2145,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-
@@ -2178,6 +2180,7 @@ template("run_mksnapshot") {
51+
@@ -2183,6 +2185,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-
@@ -6484,6 +6487,7 @@ if (v8_enable_i18n_support) {
59+
@@ -6546,6 +6549,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <[email protected]>
1919
1 file changed, 10 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 7bae0340ede9a..480f4d07a6e67 100644
22+
index ca70a35b4d269..a789a5aa0178c 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1008,16 +1008,6 @@ config("compiler_cpu_abi") {
25+
@@ -995,16 +995,6 @@ config("compiler_cpu_abi") {
2626
"-msse3",
2727
]
2828
}

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

+2-2
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 480f4d07a6e67..a0b5ad19e40ab 100644
16+
index a789a5aa0178c..fe0f989625879 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1596,6 +1596,11 @@ config("default_warnings") {
19+
@@ -1583,6 +1583,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

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

+2-2
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 422702cb196c5..59e1773326041 100644
21+
index 4d8087f0d747e..a3d75f04f6aff 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1093,7 +1093,9 @@ component("base") {
24+
@@ -1105,7 +1105,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/0009-nomerge-attribute-on-declaration-is-only-available-s.patch

-42
This file was deleted.

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

+3-3
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 a0b5ad19e40ab..ff2f5f4fcd482 100644
27+
index fe0f989625879..1259819238f17 100644
2828
--- a/build/config/compiler/BUILD.gn
2929
+++ b/build/config/compiler/BUILD.gn
30-
@@ -1299,7 +1299,6 @@ config("compiler_codegen") {
30+
@@ -1286,7 +1286,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-
@@ -1328,20 +1327,12 @@ config("compiler_deterministic") {
38+
@@ -1315,20 +1314,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/0013-Fix-html_minifier-script-for-node-v12.patch

-34
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Signed-off-by: Randy MacLeod <[email protected]>
1111
1 file changed, 5 insertions(+), 3 deletions(-)
1212

1313
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
14-
index ff2f5f4fcd482..2f99c80f51371 100644
14+
index 1259819238f17..4ae9a6e9e4df1 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -826,9 +826,11 @@ config("compiler") {
17+
@@ -816,9 +816,11 @@ config("compiler") {
1818
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
1919
# lldb doesn't have the needed changes yet.
2020
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ 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 1a82667678a16..6e9740f54876b 100644
14+
index e5e4b31d6b329..efabbb31d67af 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
17-
@@ -3699,15 +3699,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
17+
@@ -3734,15 +3734,15 @@ void WebMediaPlayerImpl::WriteSplitHistogram(
1818
const T&... values) {
1919
std::string strkey = std::string(key);
2020

0 commit comments

Comments
 (0)