chromium: Update to 121.0.6167.184

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

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

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

@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
 CVE_PRODUCT = "chromium:chromium google:chrome"
 
 SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
-SRC_URI[sha256sum] = "850a85c8d8a01041a07dfaaea8289fa5f8294b4e375e6b77997b61434e0a2f1a"
+SRC_URI[sha256sum] = "9fd6b82e7077ac26ec264bfcfc8ac8e0c2a0240378f035c9c0f34ad467aef09d"
 
 S = "${WORKDIR}/chromium-${PV}"
 
@@ -71,7 +71,6 @@ LIC_FILES_CHKSUM = "\
     file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \
     file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \
     file://${S}/base/third_party/valgrind/LICENSE;md5=b95c9cb2560f157c60ea60ac1aa69469 \
-    file://${S}/base/third_party/xdg_mime/LICENSE;md5=743a91118d40f173467c8ecfd8793c62 \
     file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \
     file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \
     file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \
@@ -91,7 +90,6 @@ LIC_FILES_CHKSUM = "\
     file://${S}/ios/third_party/motion_animator_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/ios/third_party/motion_interchange_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
     file://${S}/ios/third_party/motion_transitioning_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-    file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
     file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \
     file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \
     file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
@@ -312,10 +310,11 @@ LIC_FILES_CHKSUM = "\
     file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \
     file://${S}/third_party/libx11/LICENSE;md5=28a27b3e1a66e95206d5645b787dad69 \
     file://${S}/third_party/libxcb-keysyms/LICENSE;md5=5b0382211c6a98f8e4861daa0f3f4322 \
-    file://${S}/third_party/libxml/src/Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
+    file://${S}/third_party/libxml/src/Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
     file://${S}/third_party/libxslt/src/Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 \
     file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \
     file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \
+    file://${S}/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
     file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
     file://${S}/third_party/lss/LICENSE;md5=dcd794613f580ae04e9633662024c7a2 \
     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

@@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
  1 file changed, 38 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 80bc79e..beeb116 100644
+index de1cd6e..38b8167 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1173,11 +1173,6 @@ config("compiler_cpu_abi") {
+@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -36,7 +36,7 @@ index 80bc79e..beeb116 100644
        if (!is_nacl) {
          cflags += [
            "-march=$arm_arch",
-@@ -1187,12 +1182,6 @@ config("compiler_cpu_abi") {
+@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") {
        if (arm_tune != "") {
          cflags += [ "-mtune=$arm_tune" ]
        }
@@ -49,7 +49,7 @@ index 80bc79e..beeb116 100644
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
-@@ -1200,9 +1189,6 @@ config("compiler_cpu_abi") {
+@@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -59,7 +59,7 @@ index 80bc79e..beeb116 100644
            }
          } else {
            cflags += [ "-EL" ]
-@@ -1282,8 +1268,6 @@ config("compiler_cpu_abi") {
+@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -68,7 +68,7 @@ index 80bc79e..beeb116 100644
          } else {
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
-@@ -1331,9 +1315,6 @@ config("compiler_cpu_abi") {
+@@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -78,7 +78,7 @@ index 80bc79e..beeb116 100644
            }
          } else {
            cflags += [
-@@ -1391,8 +1372,6 @@ config("compiler_cpu_abi") {
+@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -87,7 +87,7 @@ index 80bc79e..beeb116 100644
          } else {
            cflags += [
              "-EB",
-@@ -1555,23 +1534,6 @@ config("compiler_deterministic") {
+@@ -1557,23 +1536,6 @@ config("compiler_deterministic") {
        }
      }
    }

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

@@ -29,34 +29,34 @@ index 52504f4..40425d6 100644
                                            "root_out_dir") +
                                 "/v8_context_snapshot_generator",
 diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index 01159bc..b94a2ae 100644
+index f0976f9..99304bb 100644
 --- a/v8/BUILD.gn
 +++ b/v8/BUILD.gn
-@@ -2147,6 +2147,7 @@ template("run_torque") {
+@@ -2162,6 +2162,7 @@ template("run_torque") {
      }
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2304,6 +2305,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2319,6 +2320,7 @@ action("generate_bytecode_builtins_list") {
    outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
    deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
    args = [
 +    "./v8-qemu-wrapper.sh",
      "./" + rebase_path(
              get_label_info(
                      ":bytecode_builtins_list_generator($v8_generator_toolchain)",
-@@ -2343,6 +2345,7 @@ template("run_mksnapshot") {
+@@ -2358,6 +2360,7 @@ template("run_mksnapshot") {
      data = []
 
      args = [
 +      "./v8-qemu-wrapper.sh",
        "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
                                          "root_out_dir") + "/mksnapshot",
                           root_build_dir),
-@@ -7023,6 +7026,7 @@ if (v8_enable_i18n_support) {
+@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
 
      args = [

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

@@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index beeb116..c19ac04 100644
+index 38b8167..93c9bfc 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1817,6 +1817,11 @@ config("default_warnings") {
+@@ -1819,6 +1819,11 @@ config("default_warnings") {
        cflags += [
          "-Wenum-compare-conditional",
 

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

@@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
  2 files changed, 4 insertions(+)
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 24f2397..b716e48 100644
+index 3d538b3..a7f353b 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1105,7 +1105,9 @@ component("base") {
+@@ -1098,7 +1098,9 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.

meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch

@@ -86,7 +86,7 @@ index 30be67c..1788239 100644
  #endif
 
 diff --git a/base/compiler_specific.h b/base/compiler_specific.h
-index 26bf04f..105abd3 100644
+index 6e45f97..31cffde 100644
 --- a/base/compiler_specific.h
 +++ b/base/compiler_specific.h
 @@ -42,7 +42,7 @@
@@ -98,7 +98,7 @@ index 26bf04f..105abd3 100644
  #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
  #define NOINLINE __attribute__((noinline))
  #elif defined(COMPILER_MSVC)
-@@ -52,7 +52,7 @@
+@@ -61,7 +61,7 @@
  #endif
 
  #if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
@@ -107,7 +107,7 @@ index 26bf04f..105abd3 100644
  #elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
  #define ALWAYS_INLINE inline __attribute__((__always_inline__))
  #elif defined(COMPILER_MSVC) && defined(NDEBUG)
-@@ -82,14 +82,23 @@
+@@ -91,14 +91,23 @@
  //
  // In most places you can use the C++11 keyword "alignas", which is preferred.
  //

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

@@ -68,10 +68,10 @@ index 3fb1520..7d1723f 100644
      IterMap<Id, Item>& iter_map) {
    CHECK(iter != cache.end());
 diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h
-index bbb5208..a256a85 100644
+index 5c65a65..d629125 100644
 --- a/components/optimization_guide/core/tflite_model_executor.h
 +++ b/components/optimization_guide/core/tflite_model_executor.h
-@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
+@@ -241,7 +241,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
    void SendForBatchExecution(
        BatchExecutionCallback callback_on_complete,
        base::TimeTicks start_time,
@@ -80,7 +80,7 @@ index bbb5208..a256a85 100644
        override {
      DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
+@@ -263,7 +263,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
    // Starts the synchronous execution of the model. Returns model outputs.
    // Model needs to be loaded. Synchronous calls do not load or unload model.
    std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
@@ -89,7 +89,7 @@ index bbb5208..a256a85 100644
        override {
      DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -417,7 +417,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
+@@ -421,7 +421,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
    // executes it on the model execution thread.
    void LoadModelFileAndBatchExecute(
        BatchExecutionCallback callback_on_complete,
@@ -98,7 +98,7 @@ index bbb5208..a256a85 100644
      DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
-@@ -434,7 +434,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
+@@ -438,7 +438,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
 
    // Batch executes the loaded model for inputs.
    void BatchExecuteLoadedModel(
@@ -107,7 +107,7 @@ index bbb5208..a256a85 100644
        std::vector<absl::optional<OutputType>>* outputs) {
      DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -494,7 +494,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
+@@ -498,7 +498,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
    // Unloads the model if needed.
    void BatchExecuteLoadedModelAndRunCallback(
        BatchExecutionCallback callback_on_complete,
@@ -117,10 +117,10 @@ index bbb5208..a256a85 100644
      DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 diff --git a/components/supervised_user/core/browser/proto_fetcher.cc b/components/supervised_user/core/browser/proto_fetcher.cc
-index 26a121a..802fb92 100644
+index e9a7aa7..432cc61 100644
 --- a/components/supervised_user/core/browser/proto_fetcher.cc
 +++ b/components/supervised_user/core/browser/proto_fetcher.cc
-@@ -526,7 +526,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
+@@ -528,7 +528,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
    RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
    RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
 
@@ -129,7 +129,7 @@ index 26a121a..802fb92 100644
      callback_ = std::move(callback);
      Retry();
    }
-@@ -564,7 +564,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
+@@ -566,7 +566,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl<Response> {
    }
 
    // Client callback.
@@ -138,7 +138,7 @@ index 26a121a..802fb92 100644
 
    // Retry controls.
    base::OneShotTimer timer_;
-@@ -707,7 +707,7 @@ ParallelFetchManager<Request, Response>::ParallelFetchManager(
+@@ -709,7 +709,7 @@ ParallelFetchManager<Request, Response>::ParallelFetchManager(
  template <typename Request, typename Response>
  void ParallelFetchManager<Request, Response>::Fetch(
      const Request& request,
@@ -148,7 +148,7 @@ index 26a121a..802fb92 100644
    KeyType key = requests_in_flight_.Add(MakeFetcher(request));
    requests_in_flight_.Lookup(key)->Start(
 diff --git a/components/supervised_user/core/browser/proto_fetcher.h b/components/supervised_user/core/browser/proto_fetcher.h
-index 8266c99d7..9c41978 100644
+index 1650e77..ad9832d 100644
 --- a/components/supervised_user/core/browser/proto_fetcher.h
 +++ b/components/supervised_user/core/browser/proto_fetcher.h
 @@ -165,10 +165,10 @@ class ParallelFetchManager {
@@ -205,7 +205,7 @@ index b4f3b0d..4fff750 100644
  };
 
 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
-index 83ef203e..b211f43 100644
+index 04b38ac..9457bff 100644
 --- 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
 @@ -172,7 +172,7 @@ class HTMLFastPathParser {

meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch

@@ -18,7 +18,7 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  1 file changed, 25 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 80bc79e..715bffc 100644
+index 93c9bfc..94e40fa 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -616,24 +616,6 @@ config("compiler") {

meta-chromium/recipes-browser/chromium/files/0009-Avoid-capturing-structured-bindings.patch

@@ -16,10 +16,10 @@ Signed-off-by: Max Ihlenfeldt <max@igalia.com>
  3 files changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
-index 36e307e..2bdbb60 100644
+index 630b04c..8f2b834 100644
 --- a/content/browser/service_worker/service_worker_context_wrapper.cc
 +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
-@@ -1456,9 +1456,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() {
+@@ -1473,9 +1473,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() {
    auto [document_url, key, callback] = std::move(*request);
 
    DCHECK(document_url.is_valid());
@@ -32,7 +32,7 @@ index 36e307e..2bdbb60 100644
    context_core_->registry()->FindRegistrationForClientUrl(
        ServiceWorkerRegistry::Purpose::kNotForNavigation,
 diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc
-index f013809a..144809b 100644
+index f013809..144809b 100644
 --- a/media/base/cdm_promise_adapter.cc
 +++ b/media/base/cdm_promise_adapter.cc
 @@ -94,12 +94,12 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id,
@@ -53,24 +53,24 @@ index f013809a..144809b 100644
    promises_.clear();
  }
 diff --git a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
-index 6091eade..95db975 100644
+index 33deaeb..3b283c6 100644
 --- a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
 +++ b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc
-@@ -3447,7 +3447,9 @@ void GridLayoutAlgorithm::PlaceGridItems(
+@@ -3527,7 +3527,9 @@ void GridLayoutAlgorithm::PlaceGridItems(
    DCHECK(out_row_break_between);
 
-   const auto& container_space = ConstraintSpace();
+   const auto& container_space = GetConstraintSpace();
 -  const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
 +  const auto& grid_items = sizing_tree.TreeRootData().grid_items;
 +  const auto& layout_data = sizing_tree.TreeRootData().layout_data;
 +  const auto& tree_size = sizing_tree.TreeRootData().subtree_size;
 
    const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree();
    const auto container_writing_direction =
-@@ -3611,7 +3613,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation(
+@@ -3691,7 +3693,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation(
 
    // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true.
-   const auto& constraint_space = ConstraintSpace();
+   const auto& constraint_space = GetConstraintSpace();
 -  const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData();
 +  const auto& grid_items = sizing_tree.TreeRootData().grid_items;
 +  const auto& layout_data = sizing_tree.TreeRootData().layout_data;