Skip to content

Commit 7facbf6

Browse files
chromium: Update to 121.0.6167.184 (#791)
Release notes: https://chromereleases.googleblog.com/2024/01/stable-channel-update-for-desktop_23.html https://chromereleases.googleblog.com/2024/01/stable-channel-update-for-desktop_30.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop.html https://chromereleases.googleblog.com/2024/02/stable-channel-update-for-desktop_13.html Build and patch changes: ------------------------ Drop five backported patches that are included upstream now, and add three new backports. Drop arm/0002-Fix-ARM-build-with-recent-glibc.patch as https://crrev.com/c/5035139 includes an equivalent patch. Add 0019-Don-t-require-profiler_builtins.rlib.patch to fix a build error when using OE master. Rebase and renumber remaining patches. License changes: ---------------- Added licenses: * third_party/lit/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5046161 Removed licenses: * base/third_party/xdg_mime/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/4996430 * native_client/LICENSE - not sure which change caused this, but we don't use NativeClient anyways Updated licenses: * third_party/libxml/src/Copyright - https://chromium-review.googlesource.com/c/chromium/src/+/4985186 Test-built (big thanks to @rjanani-p): -------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemuarm, qemux86-64 - nanbield, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64 - nanbield, clang, MACHINE=qemuarm, qemuarm64, qemux86-64 Signed-off-by: Max Ihlenfeldt <max@igalia.com>
1 parent c76bc3a commit 7facbf6

File tree

39 files changed

+516
-995
lines changed

39 files changed

+516
-995
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ B = "${S}/${OUTPUT_DIR}"
1212

1313
# Backported patches.
1414
SRC_URI += "\
15-
file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \
16-
file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \
17-
file://backport/IWYU-for-components-user_education-common-p.patch \
18-
file://backport/atspi-mark-possibly-unused-gn-variables.patch \
19-
file://backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch \
2015
file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \
2116
file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \
2217
file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \
2318
file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \
19+
file://backport/six-Update-vendored-copy-of-six-to-1.16.0.patch \
20+
file://backport/ToTLinux-Fix-some-narrowing-errors.patch \
21+
file://backport/Update-LegacyStatsCollector-to-conform-with.patch \
2422
"
2523
# Non-specific patches.
2624
SRC_URI += "\
@@ -42,14 +40,14 @@ SRC_URI += "\
4240
file://0016-Use-base-ranges-instead-of-std-ranges.patch \
4341
file://0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
4442
file://0018-Adjust-the-Rust-build-to-our-needs.patch \
43+
file://0019-Don-t-require-profiler_builtins.rlib.patch \
4544
"
4645
# ARM/AArch64-specific patches.
4746
SRC_URI:append:arm = "\
4847
file://arm/0001-BUILD-do-not-specify-march-on-arm.patch \
49-
file://arm/0002-Fix-ARM-build-with-recent-glibc.patch \
50-
file://arm/0003-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
48+
file://arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \
5149
"
52-
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0004-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
50+
SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}"
5351

5452
# musl-specific patches.
5553
SRC_URI:append:libc-musl = "\

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

Lines changed: 3 additions & 4 deletions
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] = "850a85c8d8a01041a07dfaaea8289fa5f8294b4e375e6b77997b61434e0a2f1a"
7+
SRC_URI[sha256sum] = "9fd6b82e7077ac26ec264bfcfc8ac8e0c2a0240378f035c9c0f34ad467aef09d"
88

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

@@ -71,7 +71,6 @@ LIC_FILES_CHKSUM = "\
7171
file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
7272
file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
7373
file://${S}/base/third_party/valgrind/LICENSE;md5=b95c9cb2560f157c60ea60ac1aa69469 \
74-
file://${S}/base/third_party/xdg_mime/LICENSE;md5=743a91118d40f173467c8ecfd8793c62 \
7574
file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \
7675
file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \
7776
file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
@@ -91,7 +90,6 @@ LIC_FILES_CHKSUM = "\
9190
file://${S}/ios/third_party/motion_animator_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9291
file://${S}/ios/third_party/motion_interchange_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9392
file://${S}/ios/third_party/motion_transitioning_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
94-
file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
9593
file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \
9694
file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \
9795
file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
@@ -312,10 +310,11 @@ LIC_FILES_CHKSUM = "\
312310
file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \
313311
file://${S}/third_party/libx11/LICENSE;md5=28a27b3e1a66e95206d5645b787dad69 \
314312
file://${S}/third_party/libxcb-keysyms/LICENSE;md5=5b0382211c6a98f8e4861daa0f3f4322 \
315-
file://${S}/third_party/libxml/src/Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
313+
file://${S}/third_party/libxml/src/Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
316314
file://${S}/third_party/libxslt/src/Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 \
317315
file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \
318316
file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \
317+
file://${S}/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
319318
file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
320319
file://${S}/third_party/lss/LICENSE;md5=dcd794613f580ae04e9633662024c7a2 \
321320
file://${S}/third_party/lzma_sdk/LICENSE;md5=eceed1d308734c8051664bc3d1ca175e \

meta-chromium/recipes-browser/chromium/files/0001-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 <randy.macleod@windriver.com>
2121
1 file changed, 38 deletions(-)
2222

2323
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
24-
index 80bc79e..beeb116 100644
24+
index de1cd6e..38b8167 100644
2525
--- a/build/config/compiler/BUILD.gn
2626
+++ b/build/config/compiler/BUILD.gn
27-
@@ -1173,11 +1173,6 @@ config("compiler_cpu_abi") {
27+
@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") {
2828
]
2929
}
3030
} else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 80bc79e..beeb116 100644
3636
if (!is_nacl) {
3737
cflags += [
3838
"-march=$arm_arch",
39-
@@ -1187,12 +1182,6 @@ config("compiler_cpu_abi") {
39+
@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") {
4040
if (arm_tune != "") {
4141
cflags += [ "-mtune=$arm_tune" ]
4242
}
@@ -49,7 +49,7 @@ index 80bc79e..beeb116 100644
4949
} else if (current_cpu == "mipsel" && !is_nacl) {
5050
ldflags += [ "-Wl,--hash-style=sysv" ]
5151
if (custom_toolchain == "") {
52-
@@ -1200,9 +1189,6 @@ config("compiler_cpu_abi") {
52+
@@ -1202,9 +1191,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 80bc79e..beeb116 100644
5959
}
6060
} else {
6161
cflags += [ "-EL" ]
62-
@@ -1282,8 +1268,6 @@ config("compiler_cpu_abi") {
62+
@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") {
6363
ldflags += [ "-Wl,--hash-style=sysv" ]
6464
if (custom_toolchain == "") {
6565
if (is_clang) {
@@ -68,7 +68,7 @@ index 80bc79e..beeb116 100644
6868
} else {
6969
cflags += [ "-EB" ]
7070
ldflags += [ "-EB" ]
71-
@@ -1331,9 +1315,6 @@ config("compiler_cpu_abi") {
71+
@@ -1333,9 +1317,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 80bc79e..beeb116 100644
7878
}
7979
} else {
8080
cflags += [
81-
@@ -1391,8 +1372,6 @@ config("compiler_cpu_abi") {
81+
@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") {
8282
ldflags += [ "-Wl,--hash-style=sysv" ]
8383
if (custom_toolchain == "") {
8484
if (is_clang) {
@@ -87,7 +87,7 @@ index 80bc79e..beeb116 100644
8787
} else {
8888
cflags += [
8989
"-EB",
90-
@@ -1555,23 +1534,6 @@ config("compiler_deterministic") {
90+
@@ -1557,23 +1536,6 @@ config("compiler_deterministic") {
9191
}
9292
}
9393
}

meta-chromium/recipes-browser/chromium/files/0002-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 01159bc..b94a2ae 100644
32+
index f0976f9..99304bb 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -2147,6 +2147,7 @@ template("run_torque") {
35+
@@ -2162,6 +2162,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-
@@ -2304,6 +2305,7 @@ action("generate_bytecode_builtins_list") {
43+
@@ -2319,6 +2320,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-
@@ -2343,6 +2345,7 @@ template("run_mksnapshot") {
51+
@@ -2358,6 +2360,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-
@@ -7023,6 +7026,7 @@ if (v8_enable_i18n_support) {
59+
@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) {
6060
outputs = [ output_file ]
6161

6262
args = [

meta-chromium/recipes-browser/chromium/files/0004-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 <Randy.MacLeod@windriver.com>
1313
1 file changed, 5 insertions(+)
1414

1515
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
16-
index beeb116..c19ac04 100644
16+
index 38b8167..93c9bfc 100644
1717
--- a/build/config/compiler/BUILD.gn
1818
+++ b/build/config/compiler/BUILD.gn
19-
@@ -1817,6 +1817,11 @@ config("default_warnings") {
19+
@@ -1819,6 +1819,11 @@ config("default_warnings") {
2020
cflags += [
2121
"-Wenum-compare-conditional",
2222

meta-chromium/recipes-browser/chromium/files/0005-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 <Randy.MacLeod@windriver.com>
1818
2 files changed, 4 insertions(+)
1919

2020
diff --git a/base/BUILD.gn b/base/BUILD.gn
21-
index 24f2397..b716e48 100644
21+
index 3d538b3..a7f353b 100644
2222
--- a/base/BUILD.gn
2323
+++ b/base/BUILD.gn
24-
@@ -1105,7 +1105,9 @@ component("base") {
24+
@@ -1098,7 +1098,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/0006-Revert-__attribute__-and-alignas-changes.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ index 30be67c..1788239 100644
8686
#endif
8787

8888
diff --git a/base/compiler_specific.h b/base/compiler_specific.h
89-
index 26bf04f..105abd3 100644
89+
index 6e45f97..31cffde 100644
9090
--- a/base/compiler_specific.h
9191
+++ b/base/compiler_specific.h
9292
@@ -42,7 +42,7 @@
@@ -98,7 +98,7 @@ index 26bf04f..105abd3 100644
9898
#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
9999
#define NOINLINE __attribute__((noinline))
100100
#elif defined(COMPILER_MSVC)
101-
@@ -52,7 +52,7 @@
101+
@@ -61,7 +61,7 @@
102102
#endif
103103

104104
#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
@@ -107,7 +107,7 @@ index 26bf04f..105abd3 100644
107107
#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
108108
#define ALWAYS_INLINE inline __attribute__((__always_inline__))
109109
#elif defined(COMPILER_MSVC) && defined(NDEBUG)
110-
@@ -82,14 +82,23 @@
110+
@@ -91,14 +91,23 @@
111111
//
112112
// In most places you can use the C++11 keyword "alignas", which is preferred.
113113
//

meta-chromium/recipes-browser/chromium/files/0007-Add-missing-typename-s.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ index 3fb1520..7d1723f 100644
6868
IterMap<Id, Item>& iter_map) {
6969
CHECK(iter != cache.end());
7070
diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h
71-
index bbb5208..a256a85 100644
71+
index 5c65a65..d629125 100644
7272
--- a/components/optimization_guide/core/tflite_model_executor.h
7373
+++ b/components/optimization_guide/core/tflite_model_executor.h
74-
@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
74+
@@ -241,7 +241,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
7575
void SendForBatchExecution(
7676
BatchExecutionCallback callback_on_complete,
7777
base::TimeTicks start_time,
@@ -80,7 +80,7 @@ index bbb5208..a256a85 100644
8080
override {
8181
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
8282
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
83-
@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
83+
@@ -263,7 +263,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
8484
// Starts the synchronous execution of the model. Returns model outputs.
8585
// Model needs to be loaded. Synchronous calls do not load or unload model.
8686
std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
@@ -89,7 +89,7 @@ index bbb5208..a256a85 100644
8989
override {
9090
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
9191
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
92-
@@ -417,7 +417,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
92+
@@ -421,7 +421,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
9393
// executes it on the model execution thread.
9494
void LoadModelFileAndBatchExecute(
9595
BatchExecutionCallback callback_on_complete,
@@ -98,7 +98,7 @@ index bbb5208..a256a85 100644
9898
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
9999
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
100100

101-
@@ -434,7 +434,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
101+
@@ -438,7 +438,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
102102

103103
// Batch executes the loaded model for inputs.
104104
void BatchExecuteLoadedModel(
@@ -107,7 +107,7 @@ index bbb5208..a256a85 100644
107107
std::vector<absl::optional<OutputType>>* outputs) {
108108
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
109109
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
110-
@@ -494,7 +494,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
110+
@@ -498,7 +498,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
111111
// Unloads the model if needed.
112112
void BatchExecuteLoadedModelAndRunCallback(
113113
BatchExecutionCallback callback_on_complete,
@@ -117,10 +117,10 @@ index bbb5208..a256a85 100644
117117
DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
118118
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
119119
diff --git a/components/supervised_user/core/browser/proto_fetcher.cc b/components/supervised_user/core/browser/proto_fetcher.cc
120-
index 26a121a..802fb92 100644
120+
index e9a7aa7..432cc61 100644
121121
--- a/components/supervised_user/core/browser/proto_fetcher.cc
122122
+++ b/components/supervised_user/core/browser/proto_fetcher.cc
123-
@@ -526,7 +526,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
123+
@@ -528,7 +528,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
124124
RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
125125
RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
126126

@@ -129,7 +129,7 @@ index 26a121a..802fb92 100644
129129
callback_ = std::move(callback);
130130
Retry();
131131
}
132-
@@ -564,7 +564,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
132+
@@ -566,7 +566,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
133133
}
134134

135135
// Client callback.
@@ -138,7 +138,7 @@ index 26a121a..802fb92 100644
138138

139139
// Retry controls.
140140
base::OneShotTimer timer_;
141-
@@ -707,7 +707,7 @@ ParallelFetchManager<Request, Response>::ParallelFetchManager(
141+
@@ -709,7 +709,7 @@ ParallelFetchManager<Request, Response>::ParallelFetchManager(
142142
template <typename Request, typename Response>
143143
void ParallelFetchManager<Request, Response>::Fetch(
144144
const Request& request,
@@ -148,7 +148,7 @@ index 26a121a..802fb92 100644
148148
KeyType key = requests_in_flight_.Add(MakeFetcher(request));
149149
requests_in_flight_.Lookup(key)->Start(
150150
diff --git a/components/supervised_user/core/browser/proto_fetcher.h b/components/supervised_user/core/browser/proto_fetcher.h
151-
index 8266c99d7..9c41978 100644
151+
index 1650e77..ad9832d 100644
152152
--- a/components/supervised_user/core/browser/proto_fetcher.h
153153
+++ b/components/supervised_user/core/browser/proto_fetcher.h
154154
@@ -165,10 +165,10 @@ class ParallelFetchManager {
@@ -205,7 +205,7 @@ index b4f3b0d..4fff750 100644
205205
};
206206

207207
diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
208-
index 83ef203e..b211f43 100644
208+
index 04b38ac..9457bff 100644
209209
--- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
210210
+++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
211211
@@ -172,7 +172,7 @@ class HTMLFastPathParser {

0 commit comments

Comments
 (0)